From 9edd667ef716da6d235f52847582962f924759c6 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 27 Oct 2017 15:20:52 +0800
Subject: [PATCH] 数据库更新数据
---
src/main/java/com/moral/monitor/entity/Sensor.java | 33 +-
.idea/workspace.xml | 418 +++++++++++++++++++++++++++++++++-------------
src/main/java/com/moral/monitor/listener/MonitorListener.java | 2
src/main/java/com/moral/monitor/listener/Listener.java | 2
src/main/java/com/moral/monitor/listener/TaskListener.java | 33 +++
5 files changed, 346 insertions(+), 142 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0df124e..8bddd0c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,10 +6,12 @@
</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/listener/TaskListener.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/TaskListener.java" />
- <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/" />
@@ -25,10 +27,145 @@
<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="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" />
+ <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" />
<folding>
<element signature="imports" expanded="true" />
+ <element signature="e#3639#3654#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">
+ <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>
+ </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">
+ <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" />
+ <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">
+ <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>
+ </file>
+ <file leaf-file-name="TaskDao.xml" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/TaskDao.xml">
+ <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>
@@ -37,8 +174,8 @@
<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="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" />
+ <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>
@@ -66,6 +203,12 @@
<find>sysConfig.properties</find>
<find>resultMap</find>
<find>monitors_storage_data</find>
+ <find>findcritical</find>
+ <find>updateequipmentstate</find>
+ <find>insertTostate</find>
+ <find>selectFromsensorByver</find>
+ <find>logger</find>
+ <find>insertTologger</find>
</findStrings>
</component>
<component name="Git.Settings">
@@ -90,7 +233,6 @@
<option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/MonitorPoint.java" />
<option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/service/impl/MonitorpointServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/util/RedisManager.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/Listener.java" />
<option value="$PROJECT_DIR$/src/main/resources/application.xml" />
<option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/TestController.java" />
<option value="$PROJECT_DIR$/src/main/resources/redis.xml" />
@@ -100,9 +242,12 @@
<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/mapper/JobDao.xml" />
<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/listener/TaskListener.java" />
</list>
</option>
@@ -120,8 +265,7 @@
<option name="FILTER_DEBUG" value="true" />
<option name="CUSTOM_FILTER" />
</component>
- <component name="ProjectFrameBounds" extendedState="6">
- <option name="x" value="-14" />
+ <component name="ProjectFrameBounds">
<option name="y" value="23" />
<option name="width" value="1404" />
<option name="height" value="877" />
@@ -149,55 +293,13 @@
<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="listener" 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="resources" type="462c0819:PsiDirectoryNode" />
- </path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scratches" />
- <pane id="Scope" />
<pane id="AndroidView" />
+ <pane id="Scope" />
<pane id="PackagesPane" />
</panes>
</component>
@@ -432,7 +534,8 @@
<workItem from="1509026048007" duration="2710000" />
<workItem from="1509030446574" duration="3006000" />
<workItem from="1509056858319" duration="2984000" />
- <workItem from="1509068025499" duration="8768000" />
+ <workItem from="1509068025499" duration="9340000" />
+ <workItem from="1509085973276" duration="2841000" />
</task>
<task id="LOCAL-00001" summary="updates">
<created>1508484578874</created>
@@ -567,17 +670,24 @@
<option name="project" value="LOCAL" />
<updated>1509083891003</updated>
</task>
- <option name="localTasksCounter" value="20" />
+ <task id="LOCAL-00020" summary="���������������������">
+ <created>1509084804781</created>
+ <option name="number" value="00020" />
+ <option name="presentableId" value="LOCAL-00020" />
+ <option name="project" value="LOCAL" />
+ <updated>1509084804781</updated>
+ </task>
+ <option name="localTasksCounter" value="21" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="61832000" />
+ <option name="totallyTimeSpent" value="65245000" />
</component>
<component name="ToolWindowManager">
- <frame x="6" y="23" width="1404" height="877" extended-state="6" />
+ <frame x="0" y="23" width="1404" height="877" extended-state="0" />
<layout>
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.68414325" sideWeight="0.5117474" order="8" side_tool="true" 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" />
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32893288" sideWeight="0.49706313" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Maven Projects" 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="4" side_tool="false" content_ui="tabs" />
<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" />
@@ -593,8 +703,8 @@
<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="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.7378517" sideWeight="0.48825258" 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.20117474" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -670,13 +780,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="75">
- <caret line="13" column="13" lean-forward="false" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
- </state>
- </provider>
- </entry>
<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">
@@ -738,13 +841,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="160">
<caret line="20" column="60" lean-forward="false" selection-start-line="20" selection-start-column="38" selection-end-line="20" selection-end-column="60" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/Sensor.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="102">
- <caret line="11" column="25" lean-forward="false" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="25" />
</state>
</provider>
</entry>
@@ -851,14 +947,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="135">
- <caret line="23" column="75" lean-forward="false" selection-start-line="23" selection-start-column="75" selection-end-line="23" selection-end-column="75" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/springframework/amqp/spring-amqp/1.6.3.RELEASE/spring-amqp-1.6.3.RELEASE.jar!/org/springframework/amqp/core/MessageListener.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
@@ -878,13 +966,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="95">
<caret line="17" column="13" lean-forward="true" selection-start-line="17" selection-start-column="4" selection-end-line="17" selection-end-column="13" />
- </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="493">
- <caret line="66" column="50" lean-forward="true" selection-start-line="65" selection-start-column="4" selection-end-line="66" selection-end-column="50" />
</state>
</provider>
</entry>
@@ -949,21 +1030,10 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/Listener.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="321">
- <caret line="114" column="51" lean-forward="false" selection-start-line="114" selection-start-column="37" selection-end-line="114" selection-end-column="51" />
- <folding>
- <element signature="imports" expanded="false" />
- </folding>
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/ApiController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="80" column="0" lean-forward="true" selection-start-line="80" selection-start-column="0" selection-end-line="80" selection-end-column="0" />
- <folding />
</state>
</provider>
</entry>
@@ -971,15 +1041,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="8" column="19" lean-forward="false" selection-start-line="8" selection-start-column="19" selection-end-line="8" selection-end-column="19" />
- <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="598">
- <caret line="132" column="0" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="134" selection-end-column="9" />
- <folding />
</state>
</provider>
</entry>
@@ -987,7 +1048,6 @@
<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" />
- <folding />
</state>
</provider>
</entry>
@@ -1011,31 +1071,151 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/JobDao.xml">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/rabbitmq.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="315">
- <caret line="21" column="32" lean-forward="false" selection-start-line="21" selection-start-column="16" selection-end-line="21" selection-end-column="32" />
+ <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>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/Critical.java">
+ <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>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/Sensor.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" />
<folding>
- <marker date="1509070503000" expanded="true" signature="504:736" ph="select c.mac... equipment" />
- <marker date="1509070503000" expanded="true" signature="795:841" ph="UPDATE equip... " />
+ <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>
- <entry file="file://$PROJECT_DIR$/src/main/resources/rabbitmq.xml">
+ <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="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" />
+ <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">
+ <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>
+ <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">
+ <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>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/Listener.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>
<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="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" />
+ <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" />
<folding>
<element signature="imports" expanded="true" />
+ <element signature="e#3639#3654#0" expanded="true" />
</folding>
</state>
</provider>
diff --git a/src/main/java/com/moral/monitor/entity/Sensor.java b/src/main/java/com/moral/monitor/entity/Sensor.java
index adae357..f9ba8ec 100644
--- a/src/main/java/com/moral/monitor/entity/Sensor.java
+++ b/src/main/java/com/moral/monitor/entity/Sensor.java
@@ -1,15 +1,16 @@
package com.moral.monitor.entity;
public class Sensor {
+
private Integer id;
private String type;
private String sensor;
- private String sensorDesc;
+ private String sensor_desc;
- private String macKey;
+ private String mac_key;
private String upper;
@@ -34,7 +35,7 @@
}
public void setType(String type) {
- this.type = type == null ? null : type.trim();
+ this.type = type;
}
public String getSensor() {
@@ -42,23 +43,23 @@
}
public void setSensor(String sensor) {
- this.sensor = sensor == null ? null : sensor.trim();
+ this.sensor = sensor;
}
- public String getSensorDesc() {
- return sensorDesc;
+ public String getSensor_desc() {
+ return sensor_desc;
}
- public void setSensorDesc(String sensorDesc) {
- this.sensorDesc = sensorDesc == null ? null : sensorDesc.trim();
+ public void setSensor_desc(String sensor_desc) {
+ this.sensor_desc = sensor_desc;
}
- 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 String getUpper() {
@@ -66,7 +67,7 @@
}
public void setUpper(String upper) {
- this.upper = upper == null ? null : upper.trim();
+ this.upper = upper;
}
public String getLower() {
@@ -74,7 +75,7 @@
}
public void setLower(String lower) {
- this.lower = lower == null ? null : lower.trim();
+ this.lower = lower;
}
public String getUnits() {
@@ -82,7 +83,7 @@
}
public void setUnits(String units) {
- this.units = units == null ? null : units.trim();
+ this.units = units;
}
public Integer getDigit() {
@@ -98,6 +99,6 @@
}
public void setVer(String ver) {
- this.ver = ver == null ? null : ver.trim();
+ this.ver = ver;
}
}
\ No newline at end of file
diff --git a/src/main/java/com/moral/monitor/listener/Listener.java b/src/main/java/com/moral/monitor/listener/Listener.java
index a8a7de0..0e00129 100644
--- a/src/main/java/com/moral/monitor/listener/Listener.java
+++ b/src/main/java/com/moral/monitor/listener/Listener.java
@@ -228,7 +228,7 @@
List<Sensor> sensors = taskDao.selectFromsensorByver(ver);
Map<String, String> ex_sensorMap = new LinkedHashMap<String, String>();
for (Sensor sensor : sensors) {
- ex_sensorMap.put(sensor.getMacKey(), sensor.getSensor());
+ ex_sensorMap.put(sensor.getMac_key(), sensor.getSensor());
}
return ex_sensorMap;
}
diff --git a/src/main/java/com/moral/monitor/listener/MonitorListener.java b/src/main/java/com/moral/monitor/listener/MonitorListener.java
index 366c523..df7c2f5 100644
--- a/src/main/java/com/moral/monitor/listener/MonitorListener.java
+++ b/src/main/java/com/moral/monitor/listener/MonitorListener.java
@@ -258,7 +258,7 @@
List<Sensor> sensors = taskDao.selectFromsensorByver(ver);
Map<String, String> ex_sensorMap = new LinkedHashMap<String, String>();
for (Sensor sensor : sensors) {
- ex_sensorMap.put(sensor.getMacKey(), sensor.getSensor());
+ ex_sensorMap.put(sensor.getMac_key(), sensor.getSensor());
}
return ex_sensorMap;
}
diff --git a/src/main/java/com/moral/monitor/listener/TaskListener.java b/src/main/java/com/moral/monitor/listener/TaskListener.java
index aa6399e..046f0c0 100644
--- a/src/main/java/com/moral/monitor/listener/TaskListener.java
+++ b/src/main/java/com/moral/monitor/listener/TaskListener.java
@@ -3,6 +3,8 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.TypeReference;
import com.moral.monitor.dao.JobDao;
+import com.moral.monitor.dao.TaskDao;
+import com.moral.monitor.entity.Sensor;
import com.moral.monitor.util.RedisUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -17,10 +19,8 @@
import javax.annotation.Resource;
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
+import java.text.SimpleDateFormat;
+import java.util.*;
public class TaskListener implements MessageListener {
@@ -29,6 +29,9 @@
@Resource
JobDao jobDao;
+
+ @Resource
+ TaskDao taskDao;
@Resource
RedisTemplate<String, String> redisTemplate;
@@ -47,6 +50,7 @@
Map<String, String> msgData = JSON.parseObject(message, new TypeReference<Map<String, String>>() {});
String mac = msgData.get("mac");
+ String ver = msgData.get("ver");
Map<String, Float> adjustMap;
if(RedisUtil.hasKey(redisTemplate, mac)) {
@@ -73,10 +77,23 @@
// 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;
+ int state = (new Random()).nextInt(4) % 5; //TODO
// rabbitTemplate.convertAndSend("monitors_alarm", "", "{\"mac\": \"" + mac + "\", \"state\": " + state + "}");
+ //������������������
jobDao.updateStateByMac(mac, state);
+
+ //������������������
+ taskDao.insertTologger(mac, message, getDate());
+
+ //������������������
+ 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));
+ }
+ }
}
private Map<String, Float> getAdjustData(String mac) {
@@ -94,4 +111,10 @@
}
return dataMap;
}
+
+ private String getDate() {
+ Date d = new Date();
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ return formatter.format(d);
+ }
}
--
Gitblit v1.8.0