http

.idea/workspace.xml

@@ -3,23 +3,12 @@
   <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$/leiSP-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/leiSP-admin/src/main/resources/application.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/system/user/user.html" beforeDir="false" afterPath="$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/system/user/user.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/leiSP-system/src/main/java/com/sooka/system/domain/SysUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/leiSP-system/src/main/java/com/sooka/system/domain/SysUser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/leiSP-system/src/main/java/com/sooka/system/mapper/SysUserMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/leiSP-system/src/main/java/com/sooka/system/mapper/SysUserMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/leiSP-system/src/main/resources/mapper/system/SysNoticeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/leiSP-system/src/main/resources/mapper/system/SysNoticeMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/leiSP-system/src/main/resources/mapper/system/SysUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/leiSP-system/src/main/resources/mapper/system/SysUserMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/leiSP-system/src/main/java/com/sooka/system/domain/SysDept.java" beforeDir="false" afterPath="$PROJECT_DIR$/leiSP-system/src/main/java/com/sooka/system/domain/SysDept.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/leiSP-system/src/main/resources/mapper/system/SysDeptMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/leiSP-system/src/main/resources/mapper/system/SysDeptMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/app/camera/controller/AppCameraController.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/app/camera/controller/AppCameraController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/app/camera/domain/AppCameraVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/app/camera/domain/AppCameraVO.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/app/camera/service/AppCameraService.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/app/camera/service/AppCameraService.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/app/camera/service/impl/AppCameraServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/app/camera/service/impl/AppCameraServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/app/maillist/service/impl/AppMailListServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/app/maillist/service/impl/AppMailListServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/app/notice/service/impl/AppNoticeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/app/notice/service/impl/AppNoticeServiceImpl.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/java/com/business/slfh/manager/firemanager/service/impl/TUEventFireServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/firemanager/service/impl/TUEventFireServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/controller/Visualization_Confirm_Controller.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/controller/Visualization_Confirm_Controller.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/mapper/grid/app/AppMailListMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/mapper/grid/app/AppMailListMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/static/visualization/js/sj.js" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/static/visualization/js/sj.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/visualization/event.html" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/visualization/event.html" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/leiSP-admin/target/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -38,20 +27,29 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="AppCameraController.java" pinned="false" current-in-tab="true">
+      <file leaf-file-name="application-druid.yml" pinned="false" current-in-tab="false">
+        <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="630">
+              <caret line="26" column="25" selection-start-line="26" selection-start-column="25" selection-end-line="26" selection-end-column="25" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="AppCameraController.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/app/camera/controller/AppCameraController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="374">
-              <caret line="37" column="1" lean-forward="true" selection-start-line="37" selection-start-column="1" selection-end-line="37" selection-end-column="1" />
+            <state relative-caret-position="132">
+              <caret line="38" column="39" lean-forward="true" selection-start-line="38" selection-start-column="39" selection-end-line="38" selection-end-column="39" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="AppDataModel.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/app/appbase/domain/AppDataModel.java">
+      <file leaf-file-name="AppCameraVO.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/app/camera/domain/AppCameraVO.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="150">
-              <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
+            <state relative-caret-position="90">
+              <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
             </state>
           </provider>
         </entry>
@@ -59,17 +57,53 @@
       <file leaf-file-name="AppCameraService.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/app/camera/service/AppCameraService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="300">
-              <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+            <state relative-caret-position="240">
+              <caret line="9" column="36" selection-start-line="9" selection-start-column="24" selection-end-line="9" selection-end-column="36" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="AppCameraServiceImpl.java" pinned="false" current-in-tab="false">
+      <file leaf-file-name="AppCameraServiceImpl.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/app/camera/service/impl/AppCameraServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="420">
-              <caret line="155" column="28" selection-start-line="155" selection-start-column="28" selection-end-line="155" selection-end-column="28" />
+            <state relative-caret-position="414">
+              <caret line="157" column="40" selection-start-line="157" selection-start-column="40" selection-end-line="157" selection-end-column="40" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <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="332">
+              <caret line="63" column="85" lean-forward="true" selection-start-line="63" selection-start-column="12" selection-end-line="63" selection-end-column="85" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="SysDeptMapper.xml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/leiSP-system/src/main/resources/mapper/system/SysDeptMapper.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="150">
+              <caret line="23" column="23" lean-forward="true" selection-start-line="23" selection-start-column="23" selection-end-line="23" selection-end-column="23" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="ITResCameraService.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/cameramanager/service/ITResCameraService.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="200">
+              <caret line="28" column="48" selection-start-line="28" selection-start-column="28" selection-end-line="28" selection-end-column="48" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="TResCameraServiceImpl.java" pinned="false" current-in-tab="false">
+        <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="200">
+              <caret line="51" column="48" selection-start-line="51" selection-start-column="28" selection-end-line="51" selection-end-column="48" />
             </state>
           </provider>
         </entry>
@@ -86,8 +120,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>selectDeptTree</find>
-      <find>事件确认</find>
       <find>/visualization/confirm</find>
       <find>drivingEvents</find>
       <find>selectUser</find>
@@ -116,6 +148,8 @@
       <find>update</find>
       <find>selectUserList</find>
       <find>SELECT u.pinyin_short, u.pinyin_first, u.pinyin_full, u.user_id</find>
+      <find>selectDeptList</find>
+      <find>selectTResCameraList</find>
     </findStrings>
     <dirStrings>
       <dir>E:\首佳工作目录\辉南-集安\code\hnly\mybusiness\src\main\java\com\business\slfh\manager\cameramanager</dir>
@@ -141,10 +175,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/demo-dsd.html" />
-        <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/cameramanager/controller/HikCameraController.java" />
-        <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/service/Visualization_Event_Service.java" />
-        <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/mapper/Visualization_Event_Mapper.java" />
         <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/resources/mapper/grid/visualization/Visualization_Event_Mapper.xml" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/service/impl/Visualization_Event_Service_Impl.java" />
@@ -189,9 +219,13 @@
         <option value="$PROJECT_DIR$/leiSP-system/src/main/java/com/sooka/system/domain/SysUser.java" />
         <option value="$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/system/user/user.html" />
         <option value="$PROJECT_DIR$/leiSP-system/src/main/resources/mapper/system/SysUserMapper.xml" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/app/camera/domain/AppCameraVO.java" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/app/camera/service/AppCameraService.java" />
-        <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/app/camera/service/impl/AppCameraServiceImpl.java" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/app/camera/controller/AppCameraController.java" />
+        <option value="$PROJECT_DIR$/leiSP-system/src/main/java/com/sooka/system/domain/SysDept.java" />
+        <option value="$PROJECT_DIR$/leiSP-system/src/main/resources/mapper/system/SysDeptMapper.xml" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/resources/mapper/grid/manager/TResCameraMapper.xml" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/app/camera/service/impl/AppCameraServiceImpl.java" />
       </list>
     </option>
   </component>
@@ -242,7 +276,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -253,6 +287,11 @@
             <path>
               <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
               <item name="hnly" type="462c0819:PsiDirectoryNode" />
+              <item name="bin" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hnly" type="462c0819:PsiDirectoryNode" />
               <item name="leiSP-admin" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -287,6 +326,51 @@
             <path>
               <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
               <item name="hnly" type="462c0819:PsiDirectoryNode" />
+              <item name="leiSP-system" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hnly" type="462c0819:PsiDirectoryNode" />
+              <item name="leiSP-system" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hnly" type="462c0819:PsiDirectoryNode" />
+              <item name="leiSP-system" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hnly" type="462c0819:PsiDirectoryNode" />
+              <item name="leiSP-system" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hnly" type="462c0819:PsiDirectoryNode" />
+              <item name="leiSP-system" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="system" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hnly" type="462c0819:PsiDirectoryNode" />
+              <item name="leiSP-system" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="system" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hnly" type="462c0819:PsiDirectoryNode" />
               <item name="mybusiness" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -363,7 +447,7 @@
               <item name="slfh" type="462c0819:PsiDirectoryNode" />
               <item name="app" type="462c0819:PsiDirectoryNode" />
               <item name="camera" type="462c0819:PsiDirectoryNode" />
-              <item name="controller" type="462c0819:PsiDirectoryNode" />
+              <item name="service" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
@@ -377,6 +461,7 @@
               <item name="app" type="462c0819:PsiDirectoryNode" />
               <item name="camera" type="462c0819:PsiDirectoryNode" />
               <item name="service" type="462c0819:PsiDirectoryNode" />
+              <item name="impl" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
@@ -388,16 +473,14 @@
               <item name="business" type="462c0819:PsiDirectoryNode" />
               <item name="slfh" type="462c0819:PsiDirectoryNode" />
               <item name="app" type="462c0819:PsiDirectoryNode" />
-              <item name="camera" type="462c0819:PsiDirectoryNode" />
-              <item name="service" type="462c0819:PsiDirectoryNode" />
-              <item name="impl" type="462c0819:PsiDirectoryNode" />
+              <item name="dept" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
       <pane id="AndroidView" />
+      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -568,7 +651,13 @@
       <workItem from="1666838435064" duration="4871000" />
       <workItem from="1666866014210" duration="4908000" />
       <workItem from="1667181073698" duration="65000" />
-      <workItem from="1667617300288" duration="13467000" />
+      <workItem from="1667617300288" duration="13516000" />
+      <workItem from="1667780062139" duration="1181000" />
+      <workItem from="1667798565323" duration="431000" />
+      <workItem from="1667898263150" duration="1692000" />
+      <workItem from="1667995548281" duration="3950000" />
+      <workItem from="1668142383504" duration="45000" />
+      <workItem from="1668391265720" duration="6253000" />
     </task>
     <task id="LOCAL-00001" summary="http">
       <created>1665216030960</created>
@@ -773,11 +862,18 @@
       <option name="project" value="LOCAL" />
       <updated>1667627509548</updated>
     </task>
-    <option name="localTasksCounter" value="30" />
+    <task id="LOCAL-00030" summary="http">
+      <created>1667638984261</created>
+      <option name="number" value="00030" />
+      <option name="presentableId" value="LOCAL-00030" />
+      <option name="project" value="LOCAL" />
+      <updated>1667638984261</updated>
+    </task>
+    <option name="localTasksCounter" value="31" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="283367000" />
+    <option name="totallyTimeSpent" value="296968000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -801,7 +897,7 @@
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info id="UI Designer" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.46276596" />
+      <window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.38404256" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32978722" />
       <window_info anchor="bottom" id="Messages" order="7" weight="0.32446808" />
       <window_info anchor="right" id="Palette&#9;" order="3" />
@@ -811,8 +907,8 @@
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.55" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.26666668" />
       <window_info anchor="bottom" id="Spring" order="7" weight="0.32978722" />
-      <window_info anchor="bottom" id="Terminal" order="7" weight="0.2744681" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20149253" />
+      <window_info anchor="bottom" id="Terminal" order="7" weight="0.27444443" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20682302" />
       <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" weight="0.32978722" />
@@ -861,59 +957,10 @@
           <option name="timeStamp" value="133" />
         </line-breakpoint>
       </breakpoints>
-      <option name="time" value="151" />
+      <option name="time" value="154" />
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/othersmanager/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="328">
-          <caret line="136" column="28" lean-forward="true" selection-start-line="136" selection-start-column="28" selection-end-line="136" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/othersmanager/controller/TUEventOthersController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-606">
-          <caret line="353" column="40" selection-start-line="353" selection-start-column="22" selection-end-line="353" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/firemanager/controller/TUEventFireController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="12150">
-          <caret line="450" column="19" selection-start-line="450" selection-start-column="19" selection-end-line="450" selection-end-column="19" />
-        </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$/leiSP-admin/src/main/resources/application-druid.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="98">
-          <caret line="11" column="16" lean-forward="true" 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/src/main/java/com/sooka/web/controller/system/SysLoginController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1024">
-          <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/main.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="299">
-          <caret line="110" column="75" selection-start-line="110" selection-start-column="70" selection-end-line="110" selection-end-column="75" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/leiSP-system/src/main/java/com/sooka/system/domain/SysMenu.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="181">
@@ -974,20 +1021,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="287">
           <caret line="48" column="48" lean-forward="true" selection-start-line="48" selection-start-column="48" selection-end-line="48" selection-end-column="48" />
-          <folding>
-            <element signature="e#1004#1005#0" expanded="true" />
-            <element signature="e#1060#1061#0" expanded="true" />
-            <element signature="e#1104#1105#0" expanded="true" />
-            <element signature="e#1150#1151#0" expanded="true" />
-            <element signature="e#1202#1203#0" expanded="true" />
-            <element signature="e#1252#1253#0" expanded="true" />
-            <element signature="e#1640#1641#0" expanded="true" />
-            <element signature="e#1697#1698#0" expanded="true" />
-            <element signature="e#1768#1769#0" expanded="true" />
-            <element signature="e#1824#1825#0" expanded="true" />
-            <element signature="e#1880#1881#0" expanded="true" />
-            <element signature="e#1929#1930#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1072,9 +1105,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2612">
           <caret line="224" column="40" selection-start-line="224" selection-start-column="40" selection-end-line="224" selection-end-column="40" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1159,10 +1189,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-3630">
           <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
-          <folding>
-            <element signature="e#3118#3119#0" expanded="true" />
-            <element signature="e#3149#3150#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1198,17 +1224,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="297">
           <caret line="70" lean-forward="true" selection-start-line="70" selection-end-line="70" />
-          <folding>
-            <element signature="e#13095#13096#0" expanded="true" />
-            <element signature="e#13145#13146#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/app/camera/service/AppCameraService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
         </state>
       </provider>
     </entry>
@@ -1223,30 +1238,88 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-1366">
           <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/bin/package.bat">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="9" column="5" selection-start-line="9" selection-start-column="5" selection-end-line="9" selection-end-column="45" />
+        </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="630">
+          <caret line="26" column="25" selection-start-line="26" selection-start-column="25" selection-end-line="26" selection-end-column="25" />
+        </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="200">
+          <caret line="51" column="48" selection-start-line="51" selection-start-column="28" selection-end-line="51" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/cameramanager/service/ITResCameraService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="200">
+          <caret line="28" column="48" selection-start-line="28" selection-start-column="28" selection-end-line="28" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/leiSP-system/src/main/java/com/sooka/system/domain/SysDept.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="293">
+          <caret line="59" column="36" selection-start-line="59" selection-start-column="36" selection-end-line="59" selection-end-column="36" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="e#1110#1111#0" expanded="true" />
+            <element signature="e#1163#1164#0" expanded="true" />
+            <element signature="e#1207#1208#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/app/camera/domain/AppCameraVO.java">
+    <entry file="file://$PROJECT_DIR$/leiSP-system/src/main/resources/mapper/system/SysDeptMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="8" column="38" selection-start-line="8" selection-start-column="38" selection-end-line="8" selection-end-column="38" />
+        <state relative-caret-position="150">
+          <caret line="23" column="23" lean-forward="true" selection-start-line="23" selection-start-column="23" selection-end-line="23" selection-end-column="23" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/app/camera/service/impl/AppCameraServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/app/camera/domain/AppCameraVO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="420">
-          <caret line="155" column="28" selection-start-line="155" selection-start-column="28" selection-end-line="155" selection-end-column="28" />
+        <state relative-caret-position="90">
+          <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/app/camera/controller/AppCameraController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="37" column="1" lean-forward="true" selection-start-line="37" selection-start-column="1" selection-end-line="37" selection-end-column="1" />
+        <state relative-caret-position="132">
+          <caret line="38" column="39" lean-forward="true" selection-start-line="38" selection-start-column="39" selection-end-line="38" selection-end-column="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/app/camera/service/AppCameraService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="9" column="36" selection-start-line="9" selection-start-column="24" selection-end-line="9" selection-end-column="36" />
+        </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="332">
+          <caret line="63" column="85" lean-forward="true" selection-start-line="63" selection-start-column="12" selection-end-line="63" selection-end-column="85" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/app/camera/service/impl/AppCameraServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="414">
+          <caret line="157" column="40" selection-start-line="157" selection-start-column="40" selection-end-line="157" selection-end-column="40" />
         </state>
       </provider>
     </entry>

leiSP-system/src/main/java/com/sooka/system/domain/SysDept.java

@@ -10,7 +10,7 @@ import com.sooka.common.core.domain.BaseEntity;
 
 /**
  * 部门表 sys_dept
- * 
+ *
  * @author lei_wang
  */
 @Getter
@@ -55,6 +55,16 @@ public class SysDept extends BaseEntity
     /** 父部门名称 */
     private String parentName;
 
+    private Integer childcount;
+
+    public Integer getChildcount() {
+        return childcount;
+    }
+
+    public void setChildcount(Integer childcount) {
+        this.childcount = childcount;
+    }
+
     public Long getDeptId()
     {
         return deptId;

leiSP-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -21,13 +21,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="createTime" column="create_time" />
 		<result property="updateBy"   column="update_by"   />
 		<result property="updateTime" column="update_time" />
+		<result property="childcount" column="childcount" />
 	</resultMap>
-	
+
 	<sql id="selectDeptVo">
-        select d.forestdept_type, d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time
+        select d.forestdept_type, d.dept_id, d.parent_id, d.ancestors, d.dept_name,
+        d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by,
+        d.create_time,
+        (select count(*) from sys_dept where parent_id =  d.dept_id) childcount
+
         from sys_dept d
     </sql>
-    
+
 	<select id="selectRoleDeptTree" parameterType="Long" resultType="String">
 		select concat(d.dept_id, d.dept_name) as dept_name
 		from sys_dept d
@@ -35,11 +40,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where d.del_flag = '0' and rd.role_id = #{roleId}
 		order by d.parent_id, d.order_num
 	</select>
-	
+
 	<select id="selectDeptList" parameterType="SysDept" resultMap="SysDeptResult">
         <include refid="selectDeptVo"/>
         where d.del_flag = '0'
-        <if test="parentId != null and parentId != 0">
+        <if test="parentId != null">
 			AND parent_id = #{parentId}
 		</if>
 		<if test="deptName != null and deptName != ''">
@@ -52,18 +57,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		${params.dataScope}
 		order by d.parent_id, d.order_num
     </select>
-	
+
 	<select id="checkDeptExistUser" parameterType="Long" resultType="int">
 		select count(1) from sys_user where dept_id = #{deptId} and del_flag = '0'
 	</select>
-	
+
 	<select id="selectDeptCount" parameterType="SysDept" resultType="int">
 		select count(1) from sys_dept
 		where del_flag = '0'
 		<if test="deptId != null and deptId != 0"> and dept_id = #{deptId} </if>
 		<if test="parentId != null and parentId != 0"> and parent_id = #{parentId} </if>
 	</select>
-	
+
 	<select id="checkDeptNameUnique" resultMap="SysDeptResult">
 	    <include refid="selectDeptVo"/>
 		where dept_name=#{deptName} and parent_id = #{parentId}
@@ -79,11 +84,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectChildrenDeptById" parameterType="Long" resultMap="SysDeptResult">
 		select * from sys_dept where find_in_set(#{deptId}, ancestors)
 	</select>
-	
+
 	<select id="selectNormalChildrenDeptById" parameterType="Long" resultType="int">
 		select count(*) from sys_dept where status = 0 and del_flag = '0' and find_in_set(#{deptId}, ancestors)
 	</select>
-	
+
 	<insert id="insertDept" parameterType="SysDept">
  		insert into sys_dept(
  			<if test="deptId != null and deptId != 0">dept_id,</if>
@@ -113,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			sysdate()
  		)
 	</insert>
-	
+
 	<update id="updateDept" parameterType="SysDept">
  		update sys_dept
  		<set>
@@ -131,7 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		</set>
  		where dept_id = #{deptId}
 	</update>
-	
+
 	<update id="updateDeptChildren" parameterType="java.util.List">
 	    update sys_dept set ancestors =
 	    <foreach collection="depts" item="item" index="index"
@@ -148,7 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<delete id="deleteDeptById" parameterType="Long">
 		update sys_dept set del_flag = '2' where dept_id = #{deptId}
 	</delete>
-	
+
 	<update id="updateDeptStatus" parameterType="SysDept">
  	    update sys_dept
  	    <set>
@@ -159,4 +164,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  	    where dept_id in (${ancestors})
 	</update>
 
-</mapper> 
+</mapper>

mybusiness/src/main/java/com/business/slfh/app/camera/controller/AppCameraController.java

@@ -6,6 +6,7 @@ import com.business.slfh.app.camera.domain.AppCameraVO;
 import com.business.slfh.app.camera.service.AppCameraService;
 import com.business.slfh.manager.cameramanager.domain.TResCamera;
 import com.business.slfh.manager.cameramanager.service.ITResCameraService;
+import com.sooka.system.service.ISysDeptService;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -20,6 +21,8 @@ public class AppCameraController extends AppBaseController {
     @Resource
     AppCameraService appCameraService;
 
+
+
     @Resource
     ITResCameraService itResCameraService;
 
@@ -35,4 +38,11 @@ public class AppCameraController extends AppBaseController {
     public AppDataModel getAppCamera(@RequestBody AppCameraVO appCameraVO) {
         return appCameraService.getAppCamera(appCameraVO);
     }
+
+    @RequestMapping("getDepts")
+    @ResponseBody
+    public AppDataModel getDepts(@RequestBody AppCameraVO appCameraVO){
+        return appCameraService.getDepts(appCameraVO);
+    }
+
 }

mybusiness/src/main/java/com/business/slfh/app/camera/domain/AppCameraVO.java

@@ -14,5 +14,10 @@ public class AppCameraVO extends BaseEntity {
 
     private Long userId;
 
+    //多选，查询多部门摄像头ids
+    private String deptIds ;
+
+    private Long deptId;
+
 
 }

mybusiness/src/main/java/com/business/slfh/app/camera/service/AppCameraService.java

@@ -8,4 +8,7 @@ public interface AppCameraService {
     public AppDataModel getCamera(AppCameraVO appCameraVO);
 
     public AppDataModel getAppCamera(AppCameraVO appCameraVO);
+
+    public AppDataModel getDepts(AppCameraVO appCameraVO);
+
 }

mybusiness/src/main/java/com/business/slfh/app/camera/service/impl/AppCameraServiceImpl.java

@@ -17,7 +17,9 @@ import com.business.slfh.visualization.event.domain.Visualization_Camera;
 import com.business.slfh.visualization.event.service.Visualization_Event_Service;
 import com.sooka.common.annotation.DataScope;
 import com.sooka.system.domain.SysConfig;
+import com.sooka.system.domain.SysDept;
 import com.sooka.system.mapper.SysConfigMapper;
+import com.sooka.system.mapper.SysDeptMapper;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -47,6 +49,10 @@ public class AppCameraServiceImpl extends AppBaseService implements AppCameraSer
     @Resource
     ITResCameraService itResCameraService;
 
+
+    @Resource
+    SysDeptMapper deptMapper;
+
     @Override
     @DataScope(deptAlias = "d")
     public AppDataModel getCamera(AppCameraVO appCameraVO) {
@@ -145,7 +151,9 @@ public class AppCameraServiceImpl extends AppBaseService implements AppCameraSer
     public AppDataModel getAppCamera(AppCameraVO appCameraVO) {
         AppDataModel appDataModel = getAppDataModel();
         try{
-            List<TResCamera>  ls = itResCameraService.selectTResCameraList(new TResCamera());
+            TResCamera tResCamera = new TResCamera();
+            tResCamera.setDeptIdBelow(appCameraVO.getDeptId());
+            List<TResCamera>  ls = itResCameraService.selectTResCameraList(tResCamera);
             appDataModel.data.put("cameralist", ls);
             appDataModel.status = Service_Success;
             appDataModel.message = "查询成功";
@@ -155,4 +163,21 @@ public class AppCameraServiceImpl extends AppBaseService implements AppCameraSer
         }
         return appDataModel;
     }
+
+    @Override
+    public AppDataModel getDepts(AppCameraVO appCameraVO) {
+        AppDataModel appDataModel = getAppDataModel();
+        try{
+            SysDept sysDept = new SysDept();
+            sysDept.setParentId(appCameraVO.getDeptId());
+            List ls = deptMapper.selectDeptList(sysDept);
+            appDataModel.data.put("depts",ls);
+            appDataModel.status = Service_Success;
+            appDataModel.message = "查询成功";
+        }catch (Exception e) {
+            appDataModel.status = Service_Error;
+            appDataModel.message = "查询失败";
+        }
+        return appDataModel;
+    }
 }