http

.idea/workspace.xml

@@ -2,13 +2,13 @@
 <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/resources/templates/dahua/css/on_off_switch.css" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/lib/on_off_switch.js" afterDir="false" />
+      <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/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/module/WebVideoCtrl.js" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/WebVideoCtrl.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/demo.js" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/demo.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/demo_jk.js" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/demo_jk.js" 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>
     <ignored path="$PROJECT_DIR$/leiSP-admin/target/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -27,38 +27,68 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="demo-dsd.html" pinned="false" current-in-tab="false">
+      <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="-1497">
-              <caret line="209" column="13" selection-start-line="209" selection-start-column="13" selection-end-line="209" selection-end-column="13" />
+            <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>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="on_off_switch.js" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/lib/on_off_switch.js">
+      <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">
+          <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>
+          </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="300">
-              <caret line="69" lean-forward="true" selection-start-line="69" selection-end-line="69" />
+              <caret line="12" column="46" selection-start-line="12" selection-start-column="46" selection-end-line="12" selection-end-column="46" />
+            </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">
+          <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>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="demo.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/demo.js">
+      <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">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="483">
-              <caret line="129" column="31" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
+            <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>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="WebVideoCtrl.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/WebVideoCtrl.js">
+      <file leaf-file-name="package.bat" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/bin/package.bat">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="474">
-              <caret line="622" column="40" selection-start-line="622" selection-start-column="40" selection-end-line="622" selection-end-column="40" />
+            <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>
+          </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">
+          <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>
           </provider>
         </entry>
@@ -68,8 +98,8 @@
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
-        <option value="Class" />
         <option value="JavaScript File" />
+        <option value="Class" />
       </list>
     </option>
   </component>
@@ -86,14 +116,16 @@
       <find>handleEvent</find>
       <find>isLun</find>
       <find>clickLogin</find>
-      <find>changeWndNum</find>
       <find>::</find>
+      <find>changeWndNum</find>
       <find>connectRealVideo</find>
+      <find>main</find>
+      <find>login</find>
     </findStrings>
     <dirStrings>
       <dir>E:\首佳工作目录\辉南-集安\code\hnly\mybusiness\src\main\java\com\business\slfh\manager\cameramanager</dir>
-      <dir>E:\首佳工作目录\辉南-集安\code\hnly</dir>
       <dir>E:\首佳工作目录\辉南-集安\code\hnly\mybusiness\src\main\resources\templates\dahua</dir>
+      <dir>E:\首佳工作目录\辉南-集安\code\hnly</dir>
     </dirStrings>
   </component>
   <component name="Git.Settings">
@@ -127,15 +159,18 @@
         <option value="$PROJECT_DIR$/leiSP-common/src/main/java/com/sooka/common/utils/poi/ExcelUtil.java" />
         <option value="$PROJECT_DIR$/leiSP-system/src/main/java/com/sooka/system/service/impl/SysDeptServiceImpl.java" />
         <option value="$PROJECT_DIR$/leiSP-system/src/main/java/com/sooka/system/service/impl/SysRoleServiceImpl.java" />
-        <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/controller/Dahua2BController.java" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/cameramanager/index.html" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/demo_jk.js" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/css/on_off_switch.css" />
         <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/demo-dsd.html" />
         <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/controller/Dahua2BController.java" />
       </list>
     </option>
   </component>
@@ -174,11 +209,11 @@
       <path value="$PROJECT_DIR$/mybusiness/src/main/resources/static/visualization/superMap/libs/iclient8c/resource/Android/phonegap/bin/package.json" />
     </packageJsonPaths>
   </component>
-  <component name="ProjectFrameBounds" extendedState="7">
-    <option name="x" value="1912" />
-    <option name="y" value="-8" />
-    <option name="width" value="1918" />
-    <option name="height" value="1038" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="371" />
+    <option name="y" value="107" />
+    <option name="width" value="1920" />
+    <option name="height" value="1040" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -187,8 +222,8 @@
     </navigator>
     <panes>
       <pane id="Scope" />
-      <pane id="AndroidView" />
       <pane id="PackagesPane" />
+      <pane id="AndroidView" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -246,28 +281,6 @@
               <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="css" 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="module" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
@@ -298,6 +311,119 @@
       <recent name="E:\首佳工作目录\辉南-集安\code\hnly\mybusiness\src\main\resources\templates" />
     </key>
   </component>
+  <component name="RestoreUpdateTree" date="Moments ago" ActionInfo="_Update">
+    <UpdatedFiles>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Updated from server" />
+        <option name="myStatusName" value="Changed on server" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="CHANGED_ON_SERVER" />
+        <FILE-GROUP>
+          <option name="myUpdateName" value="Updated" />
+          <option name="myStatusName" value="Changed" />
+          <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>
+        </FILE-GROUP>
+        <FILE-GROUP>
+          <option name="myUpdateName" value="Created" />
+          <option name="myStatusName" value="Created" />
+          <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" />
+          <option name="myStatusName" value="Deleted" />
+          <option name="mySupportsDeletion" value="false" />
+          <option name="myCanBeAbsent" value="true" />
+          <option name="myId" value="REMOVED_FROM_REPOSITORY" />
+        </FILE-GROUP>
+        <FILE-GROUP>
+          <option name="myUpdateName" value="Restored" />
+          <option name="myStatusName" value="Will be restored" />
+          <option name="mySupportsDeletion" value="false" />
+          <option name="myCanBeAbsent" value="false" />
+          <option name="myId" value="RESTORED" />
+        </FILE-GROUP>
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Modified" />
+        <option name="myStatusName" value="Modified" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="MODIFIED" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Skipped" />
+        <option name="myStatusName" value="Skipped" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="SKIPPED" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Merged with conflicts" />
+        <option name="myStatusName" value="Will be merged with conflicts" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="MERGED_WITH_CONFLICTS" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Merged with tree conflicts" />
+        <option name="myStatusName" value="Merged with tree conflicts" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="MERGED_WITH_TREE_CONFLICT" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Merged with property conflicts" />
+        <option name="myStatusName" value="Will be merged with property conflicts" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="MERGED_WITH_PROPERTY_CONFLICT" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Merged" />
+        <option name="myStatusName" value="Will be merged" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="MERGED" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Not in repository" />
+        <option name="myStatusName" value="Not in repository" />
+        <option name="mySupportsDeletion" value="true" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="UNKNOWN" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Locally added" />
+        <option name="myStatusName" value="Locally added" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="LOCALLY_ADDED" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Locally removed" />
+        <option name="myStatusName" value="Locally removed" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="LOCALLY_REMOVED" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Switched" />
+        <option name="myStatusName" value="Switched" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="SWITCHED" />
+      </FILE-GROUP>
+    </UpdatedFiles>
+  </component>
   <component name="RunDashboard">
     <option name="ruleStates">
       <list>
@@ -310,7 +436,18 @@
       </list>
     </option>
   </component>
-  <component name="RunManager">
+  <component name="RunManager" selected="Spring Boot.LeispApplication">
+    <configuration name="DahuaUtil" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="com.business.slfh.dahua.util.DahuaUtil" />
+      <module name="mybusiness" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="com.business.slfh.dahua.util.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+    </configuration>
     <configuration default="true" type="Application" factoryName="Application">
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     </configuration>
@@ -362,9 +499,14 @@
       <properties />
       <listeners />
     </configuration>
+    <list>
+      <item itemvalue="Spring Boot.LeispApplication" />
+      <item itemvalue="Application.DahuaUtil" />
+    </list>
     <recent_temporary>
       <list>
         <item itemvalue="Spring Boot.LeispApplication" />
+        <item itemvalue="Application.DahuaUtil" />
       </list>
     </recent_temporary>
   </component>
@@ -384,7 +526,8 @@
       <workItem from="1665308240063" duration="810000" />
       <workItem from="1665318635325" duration="1897000" />
       <workItem from="1665359355827" duration="7320000" />
-      <workItem from="1665370196293" duration="18721000" />
+      <workItem from="1665370196293" duration="24127000" />
+      <workItem from="1665447580649" duration="7321000" />
     </task>
     <task id="LOCAL-00001" summary="http">
       <created>1665216030960</created>
@@ -421,19 +564,26 @@
       <option name="project" value="LOCAL" />
       <updated>1665368588260</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="http">
+      <created>1665397151991</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1665397151991</updated>
+    </task>
+    <option name="localTasksCounter" value="7" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="41898000" />
+    <option name="totallyTimeSpent" value="54625000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="1912" y="-8" width="1936" height="1096" extended-state="6" />
+    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
     <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
-      <window_info anchor="right" id="Maven Projects" order="3" visible="true" weight="0.1369936" />
+      <window_info anchor="right" id="Maven Projects" order="3" visible="true" weight="0.13539445" />
       <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
       <window_info id="Capture Tool" order="2" />
       <window_info id="Designer" order="2" />
@@ -441,7 +591,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 active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.27978724" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.5288889" />
       <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" />
@@ -449,10 +599,10 @@
       <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" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.08555555" />
+      <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" weight="0.36847946" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1945629" />
+      <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="right" id="Bean Validation" order="3" />
       <window_info id="Web" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Find" order="1" />
@@ -481,28 +631,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="8250">
-          <caret line="275" column="21" selection-start-line="275" selection-start-column="21" selection-end-line="275" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/resources/application-druid.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="420">
-          <caret line="14" column="104" selection-start-line="14" selection-start-column="104" selection-end-line="14" selection-end-column="104" />
-        </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="420">
-          <caret line="14" column="49" lean-forward="true" 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="1290">
@@ -528,44 +656,44 @@
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
     <entry file="file://$PROJECT_DIR$/leiSP-generator/pom.xml">
-      <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
       <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 editor-type-id="MavenHelperPluginDependencyAnalyzer" />
       <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 editor-type-id="MavenHelperPluginDependencyAnalyzer" />
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="180">
           <caret line="6" column="36" lean-forward="true" selection-start-line="6" selection-start-column="36" selection-end-line="6" selection-end-column="36" />
         </state>
       </provider>
+      <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
     <entry file="file://$PROJECT_DIR$/leiSP-framework/pom.xml">
-      <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="132">
           <caret line="92" column="33" selection-start-line="92" selection-start-column="30" selection-end-line="92" selection-end-column="33" />
         </state>
       </provider>
+      <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
     <entry file="file://$PROJECT_DIR$/leiSP-common/pom.xml">
-      <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="330">
           <caret line="11" column="28" selection-start-line="11" selection-start-column="22" selection-end-line="11" selection-end-column="28" />
         </state>
       </provider>
+      <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
     <entry file="file://$PROJECT_DIR$/sz_jian.iml">
       <provider selected="true" editor-type-id="text-editor">
@@ -575,20 +703,20 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/leiSP-system/pom.xml">
-      <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="236">
           <caret line="30" lean-forward="true" selection-start-line="30" selection-end-line="30" />
         </state>
       </provider>
+      <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
     <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1160">
           <caret line="291" column="21" selection-start-line="291" selection-start-column="21" selection-end-line="291" selection-end-column="21" />
         </state>
       </provider>
+      <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
     <entry file="file://$PROJECT_DIR$/leiSP-common/src/main/java/com/sooka/common/core/domain/BaseEntity.java">
       <provider selected="true" editor-type-id="text-editor">
@@ -695,13 +823,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/leiSP-framework/src/main/java/com/sooka/framework/config/ShiroConfig.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="215">
-          <caret line="272" lean-forward="true" selection-start-line="272" selection-end-line="272" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/leiSP-quartz/src/main/java/com/sooka/quartz/util/AbstractQuartzJob.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="177">
@@ -730,27 +851,13 @@
         </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="240">
-          <caret line="11" column="16" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/leiSP-admin/pom.xml">
-      <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-3459">
           <caret line="5" column="25" selection-start-line="5" selection-start-column="20" selection-end-line="5" selection-end-column="25" />
         </state>
       </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/bin/package.bat">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
-        </state>
-      </provider>
+      <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
     <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/cameramanager/index.html">
       <provider selected="true" editor-type-id="text-editor">
@@ -815,31 +922,76 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/demo-dsd.html">
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/WebVideoCtrl.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1497">
-          <caret line="209" column="13" selection-start-line="209" selection-start-column="13" selection-end-line="209" selection-end-column="13" />
+        <state relative-caret-position="18660">
+          <caret line="622" column="40" selection-start-line="622" selection-start-column="40" selection-end-line="622" selection-end-column="40" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/WebVideoCtrl.js">
+    <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="474">
-          <caret line="622" column="40" selection-start-line="622" selection-start-column="40" selection-end-line="622" selection-end-column="40" />
+        <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="483">
-          <caret line="129" column="31" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
+        <state relative-caret-position="2070">
+          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/lib/on_off_switch.js">
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/controller/DahuaDsdController.java">
+      <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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/bin/package.bat">
+      <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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/util/DahuaUtil.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>
+      </provider>
+    </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">
+          <caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/leiSP-framework/src/main/java/com/sooka/framework/config/ShiroConfig.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>
+      </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="69" lean-forward="true" selection-start-line="69" selection-end-line="69" />
+          <caret line="12" column="46" selection-start-line="12" selection-start-column="46" selection-end-line="12" selection-end-column="46" />
+        </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>
       </provider>
     </entry>

leiSP-framework/src/main/java/com/sooka/framework/config/ShiroConfig.java

@@ -293,6 +293,7 @@ public class ShiroConfig
         filterChainDefinitionMap.put("/profile/upload/**", "anon,captchaValidate");
         filterChainDefinitionMap.put("/business/camera/**", "anon,captchaValidate");
         filterChainDefinitionMap.put("/system/user/resetPwdBatch/**", "anon,captchaValidate");
+        filterChainDefinitionMap.put("/getDahua2BStr/**", "anon,captchaValidate");
 
         // 注册相关
         filterChainDefinitionMap.put("/register", "anon,captchaValidate");

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

@@ -7,8 +7,10 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 public class Dahua2BController {
 
+//    http://117.78.49.164:9091/getDahua2BStr
+
     @RequestMapping("getDahua2BStr")
-    public void getDahua2BMapping(String str){
+    public void getDahua2BMapping(@RequestBody String str){
         System.out.println("2bStr=="+str);
     }
 }

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

@@ -0,0 +1,11 @@
+package com.business.slfh.dahua.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("DahuaDsdController")
+public class DahuaDsdController {
+
+    //5122. 5131. 302
+}

mybusiness/src/main/java/com/business/slfh/dahua/util/DahuaUtil.java

@@ -8,12 +8,12 @@ import java.util.Map;
 
 public class DahuaUtil {
 
-//        public static String base = "https://119.55.12.182:444";
-    public static String base = "https://122.141.177.142";
+    //        public static String base = "https://119.55.12.182:444";
+    public static String base = "https://119.52.253.110:4430";
     private SSLClient httpClientUtil;
     private String charset = "utf-8";
     String username = "system";
-    String password = "Admin123";
+    String password = "Admin123456";
 
     public DahuaUtil() {
         try {
@@ -134,16 +134,16 @@ public class DahuaUtil {
     }
 
     //录像回放拉流地址
-    public String getRecordUrl(String devicecode,String chnSeq,String beginTime,String endTime) {
+    public String getRecordUrl(String devicecode, String chnSeq, String beginTime, String endTime) {
         System.out.println("-----------------录像回放拉流地址-------------------");
         String url = base + "/admin/API/hls/getRecordUrl?token=" + token;
-        String result = "{\"hlsBeanXoList\":[{\"devicecode\":\""+devicecode+"\","
-                + "\"chnSeq\":\""+chnSeq+"\","
+        String result = "{\"hlsBeanXoList\":[{\"devicecode\":\"" + devicecode + "\","
+                + "\"chnSeq\":\"" + chnSeq + "\","
                 + "\"streamType\":\"1\","
                 + "\"recordSource\":\"3\","
-                + "\"beginTime\":\""+beginTime+"\","
+                + "\"beginTime\":\"" + beginTime + "\","
                 + "\"recordType\":\"0\","
-                + "\"endTime\":\""+endTime+"\""
+                + "\"endTime\":\"" + endTime + "\""
                 + "}]}";
         System.out.println(result);
         String r = httpClientUtil.doPost(url, result, charset, null);
@@ -152,8 +152,7 @@ public class DahuaUtil {
     }
 
 
-
-    public String QueryAlarms(String alarmCode){
+    public String QueryAlarms(String alarmCode) {
         System.out.println("-----------------查询报警信息-------------------");
         String url = base + "/admin/API/BRM/Alarm/QueryAlarms?token=" + token;
         String result = "{\n" +
@@ -181,7 +180,7 @@ public class DahuaUtil {
                 "\"orgCode\": \"\",\n" +
                 "\"channelId\": null,\n" +
                 "\"startAlarmDate\": null,\n" +
-                "\"alarmCode\": \""+alarmCode+"\"\n" +
+                "\"alarmCode\": \"" + alarmCode + "\"\n" +
                 "}\n" +
                 "}\n" +
                 "}";
@@ -192,30 +191,32 @@ public class DahuaUtil {
     }
 
 
-
-
-
-
-
-
-
-
-
-
-
+    public String eventSubscriptions() {
+        System.out.println("-----------------开始订阅-------------------");
+        String url = base + "/admin/API/alarm/eventSubscriptions?token=" + token;
+        String result = "{" +
+                "\"eventSubscriptionsAddress\":" + "\"http://117.78.49.164:9091/getDahua2BStr\"," +
+                "\"alarmType\": " + "\"5122;5131;302\"" +
+                "}";
+        System.out.println(result);
+        String r = httpClientUtil.doPost(url, result, charset, null);
+        System.out.println(r);
+        return r;
+    }
 
 
     public static void main(String[] args) {
         DahuaUtil util = new DahuaUtil();
         util.authorize();
+        util.eventSubscriptions();
 //        String al =util.QueryAlarms("{0E1A6D0E-C0B2-1F4E-8421-2787A0A3FA4B}");
 //        System.out.println(al);
 //
 //         JSONObject jso = JSON.parseObject(al);
 //         String pics =JSON.parseObject(jso.getJSONObject("data").getJSONArray("alarms").get(0).toString()).getString("picture") ;
 //         System.out.println(pics);
-         //        util.getLiveUrl("1000001");
-        util.getRecordUrl("1000018","0","2022-04-13 09:08:02","2022-04-13 09:10:02");
+        //        util.getLiveUrl("1000001");
+//        util.getRecordUrl("1000018","0","2022-04-13 09:08:02","2022-04-13 09:10:02");
 
 //        util.OperateCamera("1000001$1$0$0",1,1,1,10);
 

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

@@ -272,6 +272,15 @@
 
         GetRequest();
 
+        function my_clickLogin(hikIp,hikPort,hikUsername,hikPassword){
+            if(isLunBo == false){
+                alert("请您先关闭自动轮训功能,随后再调取固定摄像头画面.");
+            }else{
+                clickLogin(hikIp,hikPort,hikUsername,hikPassword)
+            }
+
+        }
+
         $.ajax({
             //请求方式
             type: "post",
@@ -287,7 +296,7 @@
                 $('#list').html('');
                 for (var i = 0; i < data.length; i++) {
                     var o = data[i];
-                    $('#list').append('<li onclick="clickLogin(\'' + o.hikIp + '\',\'' + o.hikPort + '\',\'' + o.hikUsername + '\',\'' + o.hikPassword + '\')"><a>' + o.name + '</a></li>');
+                    $('#list').append('<li onclick="my_clickLogin(\'' + o.hikIp + '\',\'' + o.hikPort + '\',\'' + o.hikUsername + '\',\'' + o.hikPassword + '\')"><a>' + o.name + '</a></li>');
                 }
             }
         });

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

@@ -45,7 +45,7 @@ function lunbo() {
     console.log("video_team:", video_team)
     team_index = 0;
     startPlayVideo()
-    // intercalHanler = window.setInterval(startPlayVideo, 100000)
+    intercalHanler = window.setInterval(changeTeam, 40000)
 }
 
 function sleep1(ms, callback) {
@@ -59,14 +59,18 @@ var hikPort;
 var hikUsername;
 var hikPassword;
 
+function changeTeam() {
+    team_index++;
+    play_inde = 0
+}
 
 function startPlayVideo() {
     var play_list;
     if (team_index >= video_team.length) {
         team_index = 0
     }
-    play_list = video_team[team_index++]
-
+    console.log("team_index:",team_index)
+    play_list = video_team[team_index]
 
     if (play_index >= play_list.length) {
         play_index = 0