Merge remote-tracking branch 'origin/master'

.idea/workspace.xml

@@ -3,11 +3,6 @@
   <component name="ChangeListManager">
     <list default="true" id="8ad4baec-f819-4a7c-b135-6a76a7a0c72f" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/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>
     <ignored path="$PROJECT_DIR$/leiSP-admin/target/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -26,47 +21,66 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <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">
+      <file leaf-file-name="DaHuaMessageServiceImpl.java" pinned="false" current-in-tab="true">
+        <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="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 relative-caret-position="260">
+              <caret line="401" column="16" selection-start-line="401" selection-start-column="16" selection-end-line="401" selection-end-column="16" />
             </state>
           </provider>
         </entry>
       </file>
-      <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">
+      <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/firemanager/index.html">
           <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 relative-caret-position="206">
+              <caret line="119" column="75" selection-start-line="119" selection-start-column="52" selection-end-line="119" selection-end-column="75" />
+              <folding>
+                <element signature="n#style#0;n#a#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#a#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#a#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#a#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#a#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#a#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#a#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#a#0;n#!!top" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <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">
+      <file leaf-file-name="Visualization_Event_Controller.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/controller/Visualization_Event_Controller.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 relative-caret-position="328">
+              <caret line="188" column="24" selection-start-line="188" selection-start-column="24" selection-end-line="188" selection-end-column="24" />
             </state>
           </provider>
         </entry>
       </file>
-      <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">
+      <file leaf-file-name="HikcServiceImpl.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/app/camera/service/impl/HikcServiceImpl.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 relative-caret-position="165">
+              <caret line="306" column="32" selection-start-line="306" selection-start-column="32" selection-end-line="306" selection-end-column="32" />
             </state>
           </provider>
         </entry>
       </file>
-      <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">
+      <file leaf-file-name="TResCameraMapper.xml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/mapper/grid/manager/TResCameraMapper.xml">
           <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 relative-caret-position="305">
+              <caret line="92" lean-forward="true" selection-start-line="92" selection-end-line="92" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="TResCameraMapper.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/cameramanager/mapper/TResCameraMapper.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="165">
+              <caret line="29" column="49" selection-start-line="29" selection-start-column="22" selection-end-line="29" selection-end-column="49" />
             </state>
           </provider>
         </entry>
@@ -74,7 +88,7 @@
       <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="-11216">
+            <state relative-caret-position="30">
               <caret line="16" column="43" selection-start-line="16" selection-start-column="43" selection-end-line="16" selection-end-column="43" />
             </state>
           </provider>
@@ -83,7 +97,7 @@
       <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">
+            <state relative-caret-position="1110">
               <caret line="60" column="59" selection-start-line="60" selection-start-column="59" selection-end-line="60" selection-end-column="59" />
             </state>
           </provider>
@@ -92,8 +106,8 @@
       <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="2">
-              <caret line="28" column="58" selection-start-line="28" selection-start-column="58" selection-end-line="28" selection-end-column="58" />
+            <state relative-caret-position="180">
+              <caret line="30" selection-start-line="30" selection-end-line="30" />
             </state>
           </provider>
         </entry>
@@ -128,10 +142,22 @@
       <find>main</find>
       <find>alarmSourceName</find>
       <find>my_clickLogin</find>
+      <find>startPlayVideo</find>
+      <find>alarmPicture</find>
+      <find>saveFire</find>
+      <find>getTResCameraByCameraCode</find>
+      <find>selectTResCameraByCameraId</find>
+      <find>selectTResCameraVo</find>
+      <find>openDetailsDia</find>
+      <find>getVisualizationDetails</find>
+      <find>selectTResCameraByCameraId$</find>
+      <find>itResAttachService</find>
+      <find>http://122.141.177.214:9090/dahua/demo-jkd.html</find>
     </findStrings>
     <dirStrings>
       <dir>E:\首佳工作目录\辉南-集安\code\hnly\mybusiness\src\main\java\com\business\slfh\manager\cameramanager</dir>
       <dir>E:\首佳工作目录\辉南-集安\code\hnly\mybusiness\src\main\resources\templates\dahua</dir>
+      <dir>E:\首佳工作目录\辉南-集安\code\hnly\mybusiness</dir>
       <dir>E:\首佳工作目录\辉南-集安\code\hnly</dir>
     </dirStrings>
   </component>
@@ -177,9 +203,12 @@
         <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" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/cameramanager/mapper/TResCameraMapper.java" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/resources/mapper/grid/manager/TResCameraMapper.xml" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/controller/Visualization_Event_Controller.java" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/service/impl/DaHuaMessageServiceImpl.java" />
       </list>
     </option>
   </component>
@@ -219,8 +248,8 @@
     </packageJsonPaths>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="371" />
-    <option name="y" value="107" />
+    <option name="x" value="-79" />
+    <option name="y" value="59" />
     <option name="width" value="1920" />
     <option name="height" value="1040" />
   </component>
@@ -230,8 +259,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
       <pane id="ProjectPane">
         <subPane>
@@ -277,53 +304,7 @@
               <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" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
@@ -331,12 +312,8 @@
               <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" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="grid" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
@@ -345,6 +322,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="templates" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
@@ -354,6 +332,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="resources" type="462c0819:PsiDirectoryNode" />
               <item name="templates" type="462c0819:PsiDirectoryNode" />
+              <item name="business" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
@@ -363,7 +342,8 @@
               <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="business" type="462c0819:PsiDirectoryNode" />
+              <item name="manager" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
@@ -373,13 +353,16 @@
               <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" />
+              <item name="business" type="462c0819:PsiDirectoryNode" />
+              <item name="manager" type="462c0819:PsiDirectoryNode" />
+              <item name="firemanager" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -390,7 +373,7 @@
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
     <property name="dynamic.classpath" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../../数字集安/code/jian" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="project.structure.last.edited" value="Project" />
@@ -406,123 +389,6 @@
       <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$/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" />
-          <option name="myStatusName" value="Created" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" value="CREATED" />
-        </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>
@@ -626,7 +492,8 @@
       <workItem from="1665318635325" duration="1897000" />
       <workItem from="1665359355827" duration="7320000" />
       <workItem from="1665370196293" duration="24127000" />
-      <workItem from="1665447580649" duration="13856000" />
+      <workItem from="1665447580649" duration="15844000" />
+      <workItem from="1665533158898" duration="8943000" />
     </task>
     <task id="LOCAL-00001" summary="http">
       <created>1665216030960</created>
@@ -677,15 +544,49 @@
       <option name="project" value="LOCAL" />
       <updated>1665468365508</updated>
     </task>
-    <option name="localTasksCounter" value="8" />
+    <task id="LOCAL-00008" summary="http">
+      <created>1665478277606</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1665478277606</updated>
+    </task>
+    <task id="LOCAL-00009" summary="http">
+      <created>1665479560829</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1665479560829</updated>
+    </task>
+    <task id="LOCAL-00010" summary="http">
+      <created>1665541373365</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1665541373365</updated>
+    </task>
+    <task id="LOCAL-00011" summary="http">
+      <created>1665542687992</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1665542687992</updated>
+    </task>
+    <task id="LOCAL-00012" summary="http">
+      <created>1665545712320</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1665545712320</updated>
+    </task>
+    <option name="localTasksCounter" value="13" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="61160000" />
+    <option name="totallyTimeSpent" value="72091000" />
   </component>
   <component name="ToolWindowManager">
     <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" />
@@ -697,9 +598,9 @@
       <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.3211111" />
+      <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.6022222" />
       <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Messages" order="7" weight="0.4511111" />
+      <window_info anchor="bottom" id="Messages" order="7" weight="0.46666667" />
       <window_info anchor="right" id="Palette&#9;" order="3" />
       <window_info id="Image Layers" order="2" />
       <window_info anchor="bottom" id="Java Enterprise" order="7" />
@@ -707,8 +608,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" weight="0.32" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.17217484" />
+      <window_info anchor="bottom" id="Terminal" order="7" weight="0.44042554" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.17803837" />
       <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" />
@@ -733,42 +634,10 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <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" />
+      <option name="time" value="17" />
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/mybusiness/pom.xml">
-      <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 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 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">
         <state relative-caret-position="330">
@@ -918,13 +787,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/controller/Visualization_Event_Controller.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="155">
-          <caret line="224" column="62" selection-start-line="224" selection-start-column="62" selection-end-line="224" selection-end-column="62" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/leiSP-admin/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-3459">
@@ -940,13 +802,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/mapper/grid/manager/TResCameraMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="72" column="13" lean-forward="true" selection-start-line="72" selection-start-column="13" selection-end-line="72" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/cameramanager/service/impl/TResCameraServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="260">
@@ -1003,27 +858,10 @@
         </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">
-          <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/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>
@@ -1048,66 +886,119 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/service/impl/DaHuaMessage2BServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/service/impl/DaHuaMessage2BServiceImpl.java" />
+    <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="60">
-          <caret line="2" column="38" selection-start-line="2" selection-start-column="38" selection-end-line="2" selection-end-column="38" />
+        <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/service/IDahuaMessageService.java">
+    <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="180">
-          <caret line="6" column="52" selection-start-line="6" selection-start-column="52" selection-end-line="6" selection-end-column="52" />
+        <state relative-caret-position="20760">
+          <caret line="747" selection-start-line="747" selection-end-line="747" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/controller/Dahua2BController.java">
+    <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="2">
-          <caret line="28" column="58" selection-start-line="28" selection-start-column="58" selection-end-line="28" selection-end-column="58" />
+        <state relative-caret-position="4080">
+          <caret line="136" column="13" selection-start-line="136" selection-start-column="13" selection-end-line="136" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/controller/DahuaMQController.java">
+    <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="1470">
-          <caret line="60" column="59" selection-start-line="60" selection-start-column="59" selection-end-line="60" selection-end-column="59" />
+        <state relative-caret-position="360">
+          <caret line="85" column="47" lean-forward="true" selection-start-line="85" selection-start-column="47" selection-end-line="85" selection-end-column="47" />
+        </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="300">
+          <caret line="220" column="19" selection-start-line="220" selection-start-column="19" selection-end-line="220" selection-end-column="19" />
         </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">
+        <state relative-caret-position="30">
           <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">
+    <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="416">
-          <caret line="97" selection-start-line="97" selection-end-line="97" />
+        <state relative-caret-position="1110">
+          <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/lib/on_off_switch.js">
+    <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="42">
-          <caret line="67" column="21" selection-start-line="67" selection-start-column="21" selection-end-line="67" selection-end-column="21" />
+        <state relative-caret-position="180">
+          <caret line="30" selection-start-line="30" selection-end-line="30" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://D:/Program Files/Java/jdk1.8.0_151/src.zip!/java/lang/Thread.java">
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/cameramanager/mapper/TResCameraMapper.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 relative-caret-position="165">
+          <caret line="29" column="49" selection-start-line="29" selection-start-column="22" selection-end-line="29" selection-end-column="49" />
         </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/mapper/grid/manager/TResCameraMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="92" lean-forward="true" selection-start-line="92" selection-end-line="92" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/app/camera/service/impl/HikcServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="165">
+          <caret line="306" column="32" selection-start-line="306" selection-start-column="32" selection-end-line="306" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/firemanager/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <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 relative-caret-position="206">
+          <caret line="119" column="75" selection-start-line="119" selection-start-column="52" selection-end-line="119" selection-end-column="75" />
+          <folding>
+            <element signature="n#style#0;n#a#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#a#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#a#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#a#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#a#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#a#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#a#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#a#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/controller/Visualization_Event_Controller.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="328">
+          <caret line="188" column="24" selection-start-line="188" selection-start-column="24" selection-end-line="188" selection-end-column="24" />
+        </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" lean-forward="true" 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/service/impl/DaHuaMessageServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="260">
+          <caret line="401" column="16" selection-start-line="401" selection-start-column="16" selection-end-line="401" selection-end-column="16" />
         </state>
       </provider>
     </entry>

mybusiness/src/main/java/com/business/slfh/app/event/service/AppEventService.java

@@ -5,6 +5,8 @@ import com.business.slfh.app.event.domain.AppEventQueryVo;
 import com.business.slfh.app.event.domain.AppEventVo;
 import com.business.slfh.manager.firemanager.domain.TUEventFire;
 
+import java.util.List;
+
 public interface AppEventService {
 
     public AppDataModel queryAppEventList(AppEventQueryVo appEventQueryVo);
@@ -23,4 +25,6 @@ public interface AppEventService {
 
     public AppDataModel getEventCount();
 
+    public List queryAllEventList(AppEventQueryVo appEventQueryVo);
+
 }

mybusiness/src/main/java/com/business/slfh/app/event/service/impl/AppEventServiceImpl.java

@@ -116,6 +116,13 @@ public class AppEventServiceImpl extends AppBaseService implements AppEventServi
     }
 
     @Override
+    @DataScope(deptAlias = "s")
+    public List queryAllEventList(AppEventQueryVo appEventQueryVo){
+        List list = appEventMapper.queryAllEventList(appEventQueryVo);
+        return list;
+    }
+
+    @Override
     public AppDataModel queryEventDetail(TUEventFire tuEventFire) {
         AppDataModel appDataModel = getAppDataModel();
         try {

mybusiness/src/main/java/com/business/slfh/app/mainpage/domain/MainPageVO.java

@@ -1,11 +1,12 @@
 package com.business.slfh.app.mainpage.domain;
 
+import com.sooka.common.core.domain.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
-public class MainPageVO {
+public class MainPageVO extends BaseEntity {
 
 
     Long userId;

mybusiness/src/main/java/com/business/slfh/app/mainpage/service/impl/AppMainPageServiceImpl.java

@@ -5,6 +5,7 @@ import com.business.slfh.app.appbase.service.AppBaseService;
 import com.business.slfh.app.camera.domain.AppTResCamera;
 import com.business.slfh.app.event.domain.AppEventQueryVo;
 import com.business.slfh.app.event.mapper.AppEventMapper;
+import com.business.slfh.app.event.service.AppEventService;
 import com.business.slfh.app.mainpage.domain.MainPageVO;
 import com.business.slfh.app.mainpage.mapper.AppMainPageMapper;
 import com.business.slfh.app.mainpage.service.AppMainPageService;
@@ -45,6 +46,8 @@ import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 @Service
 public class AppMainPageServiceImpl extends AppBaseService implements AppMainPageService {
@@ -54,7 +57,7 @@ public class AppMainPageServiceImpl extends AppBaseService implements AppMainPag
 
 
     @Resource
-    AppEventMapper appEventMapper;
+    AppEventService appEventService;
     @Resource
     TUEventFireMapper tuEventFireMapper;
 
@@ -136,7 +139,7 @@ public class AppMainPageServiceImpl extends AppBaseService implements AppMainPag
             AppEventQueryVo appEventQueryVo =new AppEventQueryVo();
             appEventQueryVo.setUserId(mainPageVO.getUserId());
             appEventQueryVo.setDepts(depts);
-            List ls = appEventMapper.queryAllEventList(appEventQueryVo);
+            List ls = appEventService.queryAllEventList(appEventQueryVo);
             appDataModel.data.put("eventlist",ls);
 
             BigData_Inspection_TodayWindPower today_info = bigData_Inspection_Mapper.selectTodayWindPower();

mybusiness/src/main/java/com/business/slfh/manager/cameramanager/mapper/TResCameraMapper.java

@@ -6,15 +6,15 @@ import com.business.slfh.manager.cameramanager.domain.TResCamera;
 
 /**
  * 摄像头管理Mapper接口
- * 
+ *
  * @author lei
  * @date 2020-12-24
  */
-public interface TResCameraMapper 
+public interface TResCameraMapper
 {
     /**
      * 查询摄像头管理
-     * 
+     *
      * @param id 摄像头管理ID
      * @return 摄像头管理
      */
@@ -27,10 +27,11 @@ public interface TResCameraMapper
      * @return 一个小摄像头
      */
     public TResCamera selectTResCameraByCameraId(String cameraId);
+    public TResCamera selectTResCameraByCameraId$(String cameraId);
 
     /**
      * 查询摄像头管理列表
-     * 
+     *
      * @param tResCamera 摄像头管理
      * @return 摄像头管理集合
      */
@@ -38,7 +39,7 @@ public interface TResCameraMapper
 
     /**
      * 新增摄像头管理
-     * 
+     *
      * @param tResCamera 摄像头管理
      * @return 结果
      */
@@ -46,7 +47,7 @@ public interface TResCameraMapper
 
     /**
      * 修改摄像头管理
-     * 
+     *
      * @param tResCamera 摄像头管理
      * @return 结果
      */
@@ -54,7 +55,7 @@ public interface TResCameraMapper
 
     /**
      * 删除摄像头管理
-     * 
+     *
      * @param id 摄像头管理ID
      * @return 结果
      */
@@ -62,7 +63,7 @@ public interface TResCameraMapper
 
     /**
      * 批量删除摄像头管理
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

mybusiness/src/main/java/com/business/slfh/visualization/event/controller/Visualization_Event_Controller.java

@@ -187,7 +187,7 @@ public class Visualization_Event_Controller extends AppBaseController {
                 Visualization_Attach s =p.get(j);
                 if(s.getRES_URL() != null && !s.getRES_URL().equals("")){
                     if(visualization_event.getREPORT_TYPE() != null && visualization_event.getREPORT_TYPE().equals("report_type_2") && s.getRES_URL()!= null && s.getRES_URL().indexOf("@")>0){
-                        s.setRES_URL("http://122.141.177.142/alarm/"+s.getRES_URL());
+                        s.setRES_URL("https://119.52.253.110:4430/alarm/"+s.getRES_URL());
                     }else{
                         s.setRES_URL(basebath+s.getRES_URL());
                     }
@@ -212,7 +212,7 @@ public class Visualization_Event_Controller extends AppBaseController {
                 String url = http_basepath+s.getRES_URL();
                 s.setRES_URL(url);
             }else{
-                s.setRES_URL("http://122.141.177.142/alarm/"+s.getRES_URL());
+                s.setRES_URL("https://119.52.253.110:4430/alarm/"+s.getRES_URL());
             }
 
         }

mybusiness/src/main/resources/mapper/grid/manager/TResCameraMapper.xml

@@ -84,6 +84,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where hik_camera_id like concat('%', #{hikCameraId}, '%')
     </select>
 
+    <select id="selectTResCameraByCameraId$" parameterType="String" resultMap="TResCameraResult">
+        <include refid="selectTResCameraVo"/>
+        where hik_camera_id = #{hikCameraId} limit 1
+    </select>
+
+
+
     <insert id="insertTResCamera" parameterType="TResCamera">
         insert into t_res_camera
         <trim prefix="(" suffix=")" suffixOverrides=",">

mybusiness/src/main/resources/templates/business/manager/cameramanager/index.html

@@ -199,7 +199,7 @@
     //function goCamera(hik_ip,hik_port,hik_username,hik_password,hik_deviceport){//展示画面
     function goCamera(hik_ip,hik_port,hik_username,hik_password,hik_deviceport,hik_cameraid){//展示画面
 
-        window.open('http://122.141.177.214:9090/dahua/demo-jkd.html?hik_ip='+hik_ip+'&hik_cameraid='+hik_cameraid+'&hik_deviceport='+hik_deviceport+"&hik_username="+hik_username+"&hik_password="+hik_password+"&port="+hik_port)
+        window.open('http://117.78.49.164:9091/dahua/demo-jkd.html?hik_ip='+hik_ip+'&hik_cameraid='+hik_cameraid+'&hik_deviceport='+hik_deviceport+"&hik_username="+hik_username+"&hik_password="+hik_password+"&port="+hik_port)
         //$.post('http://localhost:8899/camera_id='+hik_ip+","+hik_port+","+hik_username+","+hik_password+","+hik_deviceport,{});
     }