http

.idea/workspace.xml

@@ -2,11 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="8ad4baec-f819-4a7c-b135-6a76a7a0c72f" name="Default" comment="">
-      <change afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/controller/DahuaDsdController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/leiSP-framework/src/main/java/com/sooka/framework/config/ShiroConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/leiSP-framework/src/main/java/com/sooka/framework/config/ShiroConfig.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/controller/Dahua2BController.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/controller/Dahua2BController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/util/DahuaUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/util/DahuaUtil.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/service/IDahuaMessageService.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/service/IDahuaMessageService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/service/impl/DaHuaMessageServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/service/impl/DaHuaMessageServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/demo-dsd.html" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/demo-dsd.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/lib/on_off_switch.js" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/lib/on_off_switch.js" afterDir="false" />
     </list>
@@ -30,65 +29,71 @@
       <file leaf-file-name="demo-dsd.html" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/demo-dsd.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="8587">
-              <caret line="294" column="2" selection-start-line="294" selection-start-column="2" selection-end-line="294" selection-end-column="2" />
+            <state relative-caret-position="266">
+              <caret line="209" column="47" lean-forward="true" selection-start-line="209" selection-start-column="12" selection-end-line="209" selection-end-column="47" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="DahuaDsdController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/controller/DahuaDsdController.java">
+      <file leaf-file-name="on_off_switch.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/lib/on_off_switch.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="120">
-              <caret line="4" selection-start-line="4" selection-end-line="4" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="42">
+              <caret line="67" column="21" selection-start-line="67" selection-start-column="21" selection-end-line="67" selection-end-column="21" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Dahua2BController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/controller/Dahua2BController.java">
+      <file leaf-file-name="Thread.java" pinned="false" current-in-tab="false">
+        <entry file="jar://D:/Program Files/Java/jdk1.8.0_151/src.zip!/java/lang/Thread.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="300">
-              <caret line="12" column="46" selection-start-line="12" selection-start-column="46" selection-end-line="12" selection-end-column="46" />
+            <state relative-caret-position="306">
+              <caret line="747" selection-start-line="747" selection-end-line="747" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="FilterConfig.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/leiSP-framework/src/main/java/com/sooka/framework/config/FilterConfig.java">
+      <file leaf-file-name="IDahuaMessageService.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/service/IDahuaMessageService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-473">
-              <caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
+            <state relative-caret-position="180">
+              <caret line="6" column="52" selection-start-line="6" selection-start-column="52" selection-end-line="6" selection-end-column="52" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="ShiroConfig.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/leiSP-framework/src/main/java/com/sooka/framework/config/ShiroConfig.java">
+      <file leaf-file-name="DaHuaMessageServiceImpl.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/service/impl/DaHuaMessageServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="365">
-              <caret line="295" column="52" selection-start-line="295" selection-start-column="52" selection-end-line="295" selection-end-column="52" />
+            <state relative-caret-position="416">
+              <caret line="97" selection-start-line="97" selection-end-line="97" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="package.bat" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/bin/package.bat">
+      <file leaf-file-name="demo.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/demo.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="330">
-              <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
+            <state relative-caret-position="-11216">
+              <caret line="16" column="43" selection-start-line="16" selection-start-column="43" selection-end-line="16" selection-end-column="43" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="DahuaUtil.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/util/DahuaUtil.java">
+      <file leaf-file-name="DahuaMQController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/controller/DahuaMQController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="1470">
+              <caret line="60" column="59" selection-start-line="60" selection-start-column="59" selection-end-line="60" selection-end-column="59" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Dahua2BController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/controller/Dahua2BController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="193">
-              <caret line="198" column="52" selection-start-line="198" selection-start-column="39" selection-end-line="198" selection-end-column="52" />
+            <state relative-caret-position="2">
+              <caret line="28" column="58" selection-start-line="28" selection-start-column="58" selection-end-line="28" selection-end-column="58" />
             </state>
           </provider>
         </entry>
@@ -119,8 +124,10 @@
       <find>::</find>
       <find>changeWndNum</find>
       <find>connectRealVideo</find>
-      <find>main</find>
       <find>login</find>
+      <find>main</find>
+      <find>alarmSourceName</find>
+      <find>my_clickLogin</find>
     </findStrings>
     <dirStrings>
       <dir>E:\首佳工作目录\辉南-集安\code\hnly\mybusiness\src\main\java\com\business\slfh\manager\cameramanager</dir>
@@ -165,12 +172,14 @@
         <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/on_off_switch.js" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/demo.js" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/WebVideoCtrl.js" />
-        <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/lib/on_off_switch.js" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/controller/DahuaDsdController.java" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/util/DahuaUtil.java" />
-        <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/demo-dsd.html" />
         <option value="$PROJECT_DIR$/leiSP-framework/src/main/java/com/sooka/framework/config/ShiroConfig.java" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/service/IDahuaMessageService.java" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/controller/Dahua2BController.java" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/service/impl/DaHuaMessageServiceImpl.java" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/demo-dsd.html" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/lib/on_off_switch.js" />
       </list>
     </option>
   </component>
@@ -260,6 +269,81 @@
               <item name="mybusiness" 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="sz_jian" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hnly" type="462c0819:PsiDirectoryNode" />
+              <item name="mybusiness" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="business" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hnly" type="462c0819:PsiDirectoryNode" />
+              <item name="mybusiness" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="business" type="462c0819:PsiDirectoryNode" />
+              <item name="slfh" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hnly" type="462c0819:PsiDirectoryNode" />
+              <item name="mybusiness" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="business" type="462c0819:PsiDirectoryNode" />
+              <item name="slfh" type="462c0819:PsiDirectoryNode" />
+              <item name="dahua" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hnly" type="462c0819:PsiDirectoryNode" />
+              <item name="mybusiness" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="business" type="462c0819:PsiDirectoryNode" />
+              <item name="slfh" type="462c0819:PsiDirectoryNode" />
+              <item name="dahua" type="462c0819:PsiDirectoryNode" />
+              <item name="controller" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hnly" type="462c0819:PsiDirectoryNode" />
+              <item name="mybusiness" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="business" type="462c0819:PsiDirectoryNode" />
+              <item name="slfh" type="462c0819:PsiDirectoryNode" />
+              <item name="dahua" type="462c0819:PsiDirectoryNode" />
+              <item name="service" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hnly" type="462c0819:PsiDirectoryNode" />
+              <item name="mybusiness" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="business" type="462c0819:PsiDirectoryNode" />
+              <item name="slfh" type="462c0819:PsiDirectoryNode" />
+              <item name="dahua" type="462c0819:PsiDirectoryNode" />
+              <item name="service" type="462c0819:PsiDirectoryNode" />
+              <item name="impl" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hnly" type="462c0819:PsiDirectoryNode" />
+              <item name="mybusiness" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="resources" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -281,6 +365,17 @@
               <item name="templates" type="462c0819:PsiDirectoryNode" />
               <item name="dahua" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hnly" type="462c0819:PsiDirectoryNode" />
+              <item name="mybusiness" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="templates" type="462c0819:PsiDirectoryNode" />
+              <item name="dahua" type="462c0819:PsiDirectoryNode" />
+              <item name="lib" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -325,7 +420,14 @@
           <option name="mySupportsDeletion" value="false" />
           <option name="myCanBeAbsent" value="false" />
           <option name="myId" value="UPDATED" />
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/visualization/map.html</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/leiSP-admin/src/main/resources/static/syslogin/lydl_base.css</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/leiSP-admin/src/main/resources/static/syslogin/lydl_left.png</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/login.html</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/mybusiness/src/main/resources/static/visualization/images/hn_fxfk.png</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/css/demo.css</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/css/on_off_switch.css</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/demo-dsd.html</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/images/ja_ja.css</PATH>
         </FILE-GROUP>
         <FILE-GROUP>
           <option name="myUpdateName" value="Created" />
@@ -333,9 +435,6 @@
           <option name="mySupportsDeletion" value="false" />
           <option name="myCanBeAbsent" value="false" />
           <option name="myId" value="CREATED" />
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/mybusiness/src/main/resources/static/visualization/images/hn_fxfk.png</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/mybusiness/src/main/resources/static/visualization/images/hn_hgjs.gif</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/mybusiness/src/main/resources/static/visualization/images/hn_ysdw.png</PATH>
         </FILE-GROUP>
         <FILE-GROUP>
           <option name="myUpdateName" value="Deleted" />
@@ -527,7 +626,7 @@
       <workItem from="1665318635325" duration="1897000" />
       <workItem from="1665359355827" duration="7320000" />
       <workItem from="1665370196293" duration="24127000" />
-      <workItem from="1665447580649" duration="7321000" />
+      <workItem from="1665447580649" duration="13856000" />
     </task>
     <task id="LOCAL-00001" summary="http">
       <created>1665216030960</created>
@@ -571,11 +670,18 @@
       <option name="project" value="LOCAL" />
       <updated>1665397151991</updated>
     </task>
-    <option name="localTasksCounter" value="7" />
+    <task id="LOCAL-00007" summary="http">
+      <created>1665468365508</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1665468365508</updated>
+    </task>
+    <option name="localTasksCounter" value="8" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="54625000" />
+    <option name="totallyTimeSpent" value="61160000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -591,7 +697,7 @@
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info id="UI Designer" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.5288889" />
+      <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.3211111" />
       <window_info anchor="bottom" id="TODO" order="6" />
       <window_info anchor="bottom" id="Messages" order="7" weight="0.4511111" />
       <window_info anchor="right" id="Palette&#9;" order="3" />
@@ -601,8 +707,8 @@
       <window_info anchor="bottom" id="Version Control" order="7" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.52666664" />
       <window_info anchor="bottom" id="Spring" order="7" />
-      <window_info anchor="bottom" id="Terminal" order="7" visible="true" weight="0.25" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.23720682" />
+      <window_info anchor="bottom" id="Terminal" order="7" weight="0.32" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.17217484" />
       <window_info anchor="right" id="Bean Validation" order="3" />
       <window_info id="Web" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Find" order="1" />
@@ -627,50 +733,18 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="3" />
+      <breakpoints>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/service/impl/DaHuaMessageServiceImpl.java</url>
+          <line>309</line>
+          <properties />
+          <option name="timeStamp" value="4" />
+        </line-breakpoint>
+      </breakpoints>
+      <option name="time" value="5" />
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/resources/application.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1290">
-          <caret line="43" column="5" lean-forward="true" selection-start-line="43" selection-start-column="5" selection-end-line="43" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/java/com/LeispApplication.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="14" column="49" selection-start-line="14" selection-start-column="49" selection-end-line="14" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/resources/application.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="610">
-          <caret line="62" column="5" selection-start-line="43" selection-start-column="5" selection-end-line="62" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.gitignore">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/leiSP-generator/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="5" column="25" selection-start-line="5" selection-start-column="25" selection-end-line="5" selection-end-column="25" />
-        </state>
-      </provider>
-      <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/leiSP-quartz/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="5" column="25" selection-start-line="5" selection-start-column="25" selection-end-line="5" selection-end-column="25" />
-        </state>
-      </provider>
-      <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/mybusiness/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="180">
@@ -929,13 +1003,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/lib/on_off_switch.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1950">
-          <caret line="65" selection-start-line="65" selection-end-line="65" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/demo.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2070">
@@ -969,7 +1036,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/leiSP-framework/src/main/java/com/sooka/framework/config/FilterConfig.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-473">
+        <state relative-caret-position="-461">
           <caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
         </state>
       </provider>
@@ -981,17 +1048,66 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/service/impl/DaHuaMessage2BServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="2" column="38" selection-start-line="2" selection-start-column="38" selection-end-line="2" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/service/IDahuaMessageService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="180">
+          <caret line="6" column="52" selection-start-line="6" selection-start-column="52" selection-end-line="6" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/controller/Dahua2BController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="12" column="46" selection-start-line="12" selection-start-column="46" selection-end-line="12" selection-end-column="46" />
+        <state relative-caret-position="2">
+          <caret line="28" column="58" selection-start-line="28" selection-start-column="58" selection-end-line="28" selection-end-column="58" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/controller/DahuaMQController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1470">
+          <caret line="60" column="59" selection-start-line="60" selection-start-column="59" selection-end-line="60" selection-end-column="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/demo.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-11216">
+          <caret line="16" column="43" selection-start-line="16" selection-start-column="43" selection-end-line="16" selection-end-column="43" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/service/impl/DaHuaMessageServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="97" selection-start-line="97" selection-end-line="97" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/lib/on_off_switch.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="42">
+          <caret line="67" column="21" selection-start-line="67" selection-start-column="21" selection-end-line="67" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://D:/Program Files/Java/jdk1.8.0_151/src.zip!/java/lang/Thread.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="306">
+          <caret line="747" selection-start-line="747" selection-end-line="747" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/demo-dsd.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="8587">
-          <caret line="294" column="2" selection-start-line="294" selection-start-column="2" selection-end-line="294" selection-end-column="2" />
+        <state relative-caret-position="266">
+          <caret line="209" column="47" lean-forward="true" selection-start-line="209" selection-start-column="12" selection-end-line="209" selection-end-column="47" />
         </state>
       </provider>
     </entry>

mybusiness/src/main/java/com/business/slfh/dahua/controller/Dahua2BController.java

@@ -1,16 +1,38 @@
 package com.business.slfh.dahua.controller;
 
+import com.business.slfh.dahua.service.IDahuaMessageService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.jms.JMSException;
+
 @RestController
 public class Dahua2BController {
 
-//    http://117.78.49.164:9091/getDahua2BStr
+    //    http://117.78.49.164:9091/getDahua2BStr
+    @Autowired
+    IDahuaMessageService iDahuaMessageService;
+
 
     @RequestMapping("getDahua2BStr")
-    public void getDahua2BMapping(@RequestBody String str){
-        System.out.println("2bStr=="+str);
+    public void getDahua2BMapping(@RequestBody String str) {
+
+        System.out.println("2bStr==" + str);
+
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    System.err.println("消息接收完成...." + str);
+                    iDahuaMessageService.receiveMessage2B(str);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }).start();
+
+
     }
 }

mybusiness/src/main/java/com/business/slfh/dahua/service/IDahuaMessageService.java

@@ -4,4 +4,6 @@ public interface IDahuaMessageService {
 
     public void receiveMqMessage(String messageStr);
 
+    public void receiveMessage2B(String messageStr);
+
 }

mybusiness/src/main/java/com/business/slfh/dahua/service/impl/DaHuaMessageServiceImpl.java

@@ -300,6 +300,27 @@ public class DaHuaMessageServiceImpl implements IDahuaMessageService {
 
     }
 
+    @Override
+    public void receiveMessage2B(String messageStr) {
+        JSONObject infoJson = JSON.parseObject(messageStr);
+        String picturePath = infoJson.getString("picturePath");
+        String deviceCode = infoJson.getString("deviceCode");
+
+
+        String gpsX = infoJson.getString("gpsX");
+        String gpsY = infoJson.getString("gpsY");
+        String fireDistance = infoJson.getString("fireDistance");
+
+        String alarmCode = infoJson.getString("alarmCode");
+
+        String alarmType = infoJson.getString("alarmType");
+        String alarmSourceName = infoJson.getString("alarmSourceName");
+        Date alarmDate = new Date(infoJson.getLong("alarmDate")*1000L);
+    }
+
+
+
+
     private void saveFire(TUEventFire tUEventFire, String[] imgUrls) {
         tUEventFireMapper.insertTUEventFire(tUEventFire);
 //        saveAttach(tUEventFire.getId(), imgUrls);

mybusiness/src/main/resources/templates/dahua/demo-dsd.html

@@ -204,6 +204,15 @@
 
 
 <script>
+    function my_clickLogin(hikIp,hikPort,hikUsername,hikPassword){
+        console.log("my_chick:",isLunBo)
+        if(isLunBo == true){
+            alert("请您先关闭自动轮训功能,随后再调取固定摄像头画面.");
+        }else{
+            clickLogin(hikIp,hikPort,hikUsername,hikPassword)
+        }
+
+    }
 
 
     var deptId;
@@ -279,14 +288,7 @@
 
         GetRequest();
 
-        function my_clickLogin(hikIp,hikPort,hikUsername,hikPassword){
-            if(isLunBo == false){
-                alert("请您先关闭自动轮训功能,随后再调取固定摄像头画面.");
-            }else{
-                clickLogin(hikIp,hikPort,hikUsername,hikPassword)
-            }
 
-        }
 
         $.ajax({
             //请求方式

mybusiness/src/main/resources/templates/dahua/lib/on_off_switch.js

@@ -65,7 +65,7 @@ function changeTeam() {
 }
 
 function startPlayVideo() {
-    var play_list;
+    var play_list =[];
     if (team_index >= video_team.length) {
         team_index = 0
     }