update device event logic

.idea/workspace.xml

@@ -3,21 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="fb6ddcd0-df98-4d65-a159-b2472538162d" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wsm-admin-dao/src/main/java/com/wsm/admin/dao/IDeviceEventDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/wsm-admin-dao/src/main/java/com/wsm/admin/dao/IDeviceEventDao.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wsm-admin-dao/src/main/java/com/wsm/admin/model/DeviceEvent.java" beforeDir="false" afterPath="$PROJECT_DIR$/wsm-admin-dao/src/main/java/com/wsm/admin/model/DeviceEvent.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wsm-admin-service/src/main/java/com/wsm/admin/service/IDeviceEventService.java" beforeDir="false" afterPath="$PROJECT_DIR$/wsm-admin-service/src/main/java/com/wsm/admin/service/IDeviceEventService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wsm-admin-service/src/main/java/com/wsm/admin/service/impl/DeviceEventServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/wsm-admin-service/src/main/java/com/wsm/admin/service/impl/DeviceEventServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/api/ApiDeviceController.java" beforeDir="false" afterPath="$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/api/ApiDeviceController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/api/DeviceEventController.java" beforeDir="false" afterPath="$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/api/DeviceEventController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/device/init/TaskSchedule.java" beforeDir="false" afterPath="$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/device/init/TaskSchedule.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/device/mqtt/PushCallback.java" beforeDir="false" afterPath="$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/device/mqtt/PushCallback.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/device/tcp/ConvertData.java" beforeDir="false" afterPath="$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/device/tcp/ConvertData.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/device/tcp/NettyServerHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/device/tcp/NettyServerHandler.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wsm-application/src/main/resources/static/js/map.js" beforeDir="false" afterPath="$PROJECT_DIR$/wsm-application/src/main/resources/static/js/map.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wsm-application/src/main/resources/templates/admin/device/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/wsm-application/src/main/resources/templates/admin/device/form.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wsm-application/src/main/resources/templates/admin/device/list.html" beforeDir="false" afterPath="$PROJECT_DIR$/wsm-application/src/main/resources/templates/admin/device/list.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wsm-application/src/main/resources/templates/admin/deviceEvent/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/wsm-application/src/main/resources/templates/admin/deviceEvent/form.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wsm-application/src/main/resources/templates/admin/deviceEvent/list.html" beforeDir="false" afterPath="$PROJECT_DIR$/wsm-application/src/main/resources/templates/admin/deviceEvent/list.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/wsm-admin-web/target/" />
     <ignored path="$PROJECT_DIR$/wsm-common/target/" />
@@ -40,55 +26,55 @@
         <entry file="file://$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/device/mqtt/PushCallback.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="401">
-              <caret line="128" lean-forward="true" selection-start-line="128" selection-end-line="128" />
+              <caret line="128" selection-start-line="128" selection-end-line="128" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="TaskSchedule.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/device/init/TaskSchedule.java">
+      <file leaf-file-name="TopicCode.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/device/mqtt/TopicCode.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="442">
-              <caret line="77" column="23" lean-forward="true" selection-start-line="77" selection-start-column="23" selection-end-line="77" selection-end-column="23" />
+            <state relative-caret-position="479">
+              <caret line="34" column="31" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="ApiDeviceController.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/api/ApiDeviceController.java">
+      <file leaf-file-name="ClientMQTT.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/device/mqtt/ClientMQTT.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="493">
-              <caret line="48" column="1" lean-forward="true" selection-start-line="48" selection-start-column="1" selection-end-line="48" selection-end-column="1" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="366">
+              <caret line="60" selection-start-line="60" selection-end-line="60" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="DeviceEventController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/api/DeviceEventController.java">
+      <file leaf-file-name="ApiDeviceController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/api/ApiDeviceController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="459">
-              <caret line="124" lean-forward="true" selection-start-line="124" selection-end-line="124" />
+            <state relative-caret-position="122">
+              <caret line="26" column="14" lean-forward="true" selection-start-line="26" selection-start-column="14" selection-end-line="26" selection-end-column="14" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="list.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/wsm-application/src/main/resources/templates/admin/device/list.html">
+      <file leaf-file-name="CoverTcpServer.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/device/tcp/CoverTcpServer.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="901">
-              <caret line="53" selection-start-line="53" selection-end-line="56" selection-end-column="48" />
+            <state relative-caret-position="-55">
+              <caret line="18" column="10" selection-start-line="18" selection-start-column="10" selection-end-line="18" selection-end-column="10" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="MsgCode.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/constant/MsgCode.java">
+      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/wsm-admin-web/pom.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="170">
-              <caret line="10" column="25" selection-start-line="10" selection-start-column="25" selection-end-line="10" selection-end-column="25" />
+            <state relative-caret-position="302">
+              <caret line="46" column="59" lean-forward="true" selection-start-line="46" selection-start-column="59" selection-end-line="46" selection-end-column="59" />
             </state>
           </provider>
         </entry>
@@ -96,26 +82,20 @@
       <file leaf-file-name="NettyServerHandler.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/device/tcp/NettyServerHandler.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-626">
-              <caret line="190" column="37" lean-forward="true" selection-start-line="190" selection-start-column="37" selection-end-line="190" selection-end-column="37" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="DeviceEvent.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/wsm-admin-dao/src/main/java/com/wsm/admin/model/DeviceEvent.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="493">
-              <caret line="36" column="7" selection-start-line="36" selection-start-column="7" selection-end-line="36" selection-end-column="36" />
+            <state relative-caret-position="32">
+              <caret line="157" lean-forward="true" selection-start-line="157" selection-end-line="157" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Device.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/wsm-admin-dao/src/main/java/com/wsm/admin/model/Device.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="391">
-              <caret line="50" column="7" selection-start-line="50" selection-start-column="7" selection-end-line="50" selection-end-column="34" />
+      <file leaf-file-name="README.md" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/README.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="153">
+                <caret line="9" column="4" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" />
+              </first_editor>
+              <second_editor />
             </state>
           </provider>
         </entry>
@@ -145,6 +125,11 @@
       <find>list size:</find>
       <find>authc</find>
       <find>isAccessAllowed</find>
+      <find>specification</find>
+      <find>deviceService.</find>
+      <find>Specification</find>
+      <find>netty</find>
+      <find>heartbeat device id</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -166,7 +151,6 @@
         <option value="$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/api/LiveController.java" />
         <option value="$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/api/KaptchaController.java" />
         <option value="$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/init/StartupUdpEvent.java" />
-        <option value="$PROJECT_DIR$/README.md" />
         <option value="$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/init/TaskSchedule.java" />
         <option value="$PROJECT_DIR$/wsm-application/src/main/resources/application-pro.properties" />
         <option value="$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/mqtt/PushCallback.java" />
@@ -192,6 +176,7 @@
         <option value="$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/api/DeviceEventController.java" />
         <option value="$PROJECT_DIR$/wsm-application/src/main/resources/templates/admin/device/list.html" />
         <option value="$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/api/ApiDeviceController.java" />
+        <option value="$PROJECT_DIR$/README.md" />
       </list>
     </option>
   </component>
@@ -575,7 +560,7 @@
       <updated>1573182301041</updated>
       <workItem from="1573182306625" duration="7204000" />
       <workItem from="1576231069731" duration="10671000" />
-      <workItem from="1576483258398" duration="28066000" />
+      <workItem from="1576483258398" duration="38072000" />
     </task>
     <task id="LOCAL-00001" summary="添加了传感器">
       <created>1576231455524</created>
@@ -591,11 +576,18 @@
       <option name="project" value="LOCAL" />
       <updated>1576459652164</updated>
     </task>
-    <option name="localTasksCounter" value="3" />
+    <task id="LOCAL-00003" summary="update device event logic">
+      <created>1576806659129</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1576806659129</updated>
+    </task>
+    <option name="localTasksCounter" value="4" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="45941000" />
+    <option name="totallyTimeSpent" value="55947000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-7" y="-13" width="1936" height="1049" extended-state="0" />
@@ -622,7 +614,7 @@
       <window_info anchor="bottom" id="Java Enterprise" order="7" />
       <window_info anchor="right" id="Capture Analysis" order="3" />
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.32857144" />
-      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.2956044" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.8747253" />
       <window_info anchor="bottom" id="Spring" order="7" />
       <window_info anchor="bottom" id="Terminal" order="7" />
       <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.17697228" />
@@ -683,7 +675,8 @@
   <component name="VcsManagerConfiguration">
     <MESSAGE value="添加了传感器" />
     <MESSAGE value="优化目录结构" />
-    <option name="LAST_COMMIT_MESSAGE" value="优化目录结构" />
+    <MESSAGE value="update device event logic" />
+    <option name="LAST_COMMIT_MESSAGE" value="update device event logic" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -691,59 +684,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/api/LiveController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1292">
-          <caret line="97" column="43" selection-start-line="97" selection-start-column="38" selection-end-line="97" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/api/ResourceController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="102">
-          <caret line="35" column="13" selection-start-line="35" selection-start-column="13" selection-end-line="35" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/api/RoleController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="102">
-          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/4.3.16.RELEASE/spring-context-4.3.16.RELEASE-sources.jar!/org/springframework/context/ApplicationListener.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="265">
-          <caret line="35" column="17" selection-start-line="35" selection-start-column="17" selection-end-line="35" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/shiro/MyShiroRealm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="119">
-          <caret line="52" column="48" selection-start-line="52" selection-start-column="48" selection-end-line="52" selection-end-column="48" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="85">
-            <caret line="5" column="7" selection-start-line="5" selection-start-column="7" selection-end-line="5" selection-end-column="7" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/device/mqtt/ClientMQTT.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="213">
-          <caret line="60" selection-start-line="60" selection-end-line="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/init/UdpServer.java" />
     <entry file="file://$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/tcp/NettyServer.java" />
     <entry file="file://$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/init/TcpServer.java" />
     <entry file="file://$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/handle/UdpServerHandler.java" />
@@ -754,27 +694,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/device/mqtt/TopicCode.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="350">
-          <caret line="34" column="31" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/device/tcp/Rule.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="102">
-          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/device/init/StartupUdpEvent.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="306">
-          <caret line="30" column="26" selection-start-line="30" selection-start-column="12" selection-end-line="30" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/wsm-admin-dao/src/main/java/com/wsm/admin/dao/IResourceDao.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="170">
@@ -852,13 +771,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/device/tcp/CoverTcpServer.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="119">
-          <caret line="18" column="10" selection-start-line="18" selection-start-column="10" selection-end-line="18" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/wsm-application/src/main/resources/application.properties">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="510">
@@ -982,20 +894,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/device/tcp/NettyServerHandler.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-626">
-          <caret line="190" column="37" lean-forward="true" selection-start-line="190" selection-start-column="37" selection-end-line="190" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/device/mqtt/PushCallback.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="401">
-          <caret line="128" lean-forward="true" selection-start-line="128" selection-end-line="128" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/wsm-admin-dao/src/main/java/com/wsm/admin/model/DeviceEvent.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="493">
@@ -1031,16 +929,116 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/api/ResourceController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2125">
+          <caret line="125" column="66" selection-start-line="125" selection-start-column="58" selection-end-line="125" selection-end-column="66" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/api/RoleController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1296">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="289">
+          <caret line="146" column="60" selection-start-line="146" selection-start-column="60" selection-end-line="146" selection-end-column="60" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/device/init/StartupUdpEvent.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="204">
+          <caret line="30" column="26" selection-start-line="30" selection-start-column="12" selection-end-line="30" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/device/tcp/Rule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="102">
+          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/device/mqtt/PushCallback.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="401">
+          <caret line="128" selection-start-line="128" selection-end-line="128" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/device/mqtt/TopicCode.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="479">
+          <caret line="34" column="31" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/device/mqtt/ClientMQTT.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="366">
+          <caret line="60" selection-start-line="60" selection-end-line="60" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/device/tcp/CoverTcpServer.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-55">
+          <caret line="18" column="10" selection-start-line="18" selection-start-column="10" selection-end-line="18" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/wsm-admin-web/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="302">
+          <caret line="46" column="59" lean-forward="true" selection-start-line="46" selection-start-column="59" selection-end-line="46" selection-end-column="59" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/api/ApiDeviceController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="493">
-          <caret line="48" column="1" lean-forward="true" selection-start-line="48" selection-start-column="1" selection-end-line="48" selection-end-column="1" />
+        <state relative-caret-position="122">
+          <caret line="26" column="14" lean-forward="true" selection-start-line="26" selection-start-column="14" selection-end-line="26" selection-end-column="14" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/wsm-admin-web/src/main/java/com/wsm/admin/device/tcp/NettyServerHandler.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="32">
+          <caret line="157" lean-forward="true" selection-start-line="157" selection-end-line="157" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/log/base.2019-12-23.log">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/log/base.2019-12-22.log">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="629">
+          <caret line="61" column="110" lean-forward="true" selection-start-line="61" selection-start-column="110" selection-end-line="61" selection-end-column="110" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="153">
+            <caret line="9" column="4" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

README.md

@@ -3,4 +3,8 @@
 问题
 1. 当警情超过24小时没有处理，传感器又没有心跳，心跳检测会把当前传感器设置为离线状态。
 
-2. 统一个设备，报火警，报低电压、报离线，算多少个事件。目前是算3个事件
+2. 统一个设备，报火警，报低电压、报离线，算多少个事件。目前是算3个事件
+
+前端对接：
+    江门智慧城管管理平台
+