http

.idea/workspace.xml

@@ -2,7 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="8ad4baec-f819-4a7c-b135-6a76a7a0c72f" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/tools/JiGuangPushUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/tools/JiGuangPushUtil.java" afterDir="false" />
+      <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/manager/cameramanager/controller/TResCameraController.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/cameramanager/controller/TResCameraController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/cameramanager/domain/TResCamera.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/cameramanager/domain/TResCamera.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/mapper/grid/manager/TResCameraMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/mapper/grid/manager/TResCameraMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/cameramanager/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/cameramanager/add.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/cameramanager/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/cameramanager/edit.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/cameramanager/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/cameramanager/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/leiSP-admin/target/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -21,11 +28,65 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="JiGuangPushUtil.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/tools/JiGuangPushUtil.java">
+      <file leaf-file-name="TResCameraMapper.xml" pinned="false" current-in-tab="true">
+        <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="180">
-              <caret line="21" column="65" selection-start-line="21" selection-start-column="65" selection-end-line="21" selection-end-column="65" />
+            <state relative-caret-position="229">
+              <caret line="178" column="38" selection-start-line="178" selection-start-column="38" selection-end-line="178" selection-end-column="38" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/cameramanager/index.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="390">
+              <caret line="112" column="30" selection-start-line="112" selection-start-column="30" selection-end-line="112" selection-end-column="30" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="add.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/cameramanager/add.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-2580">
+              <caret line="13" column="58" selection-start-line="13" selection-start-column="58" selection-end-line="13" selection-end-column="58" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="edit.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/cameramanager/edit.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-4015">
+              <caret line="12" column="52" selection-start-line="12" selection-start-column="50" selection-end-line="12" selection-end-column="52" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="TResCameraController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/cameramanager/controller/TResCameraController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="321">
+              <caret line="168" selection-start-line="168" selection-end-line="168" />
+            </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="177">
+              <caret line="44" selection-start-line="44" selection-end-line="44" />
+            </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="350">
+              <caret line="83" column="48" selection-start-line="83" selection-start-column="32" selection-end-line="83" selection-end-column="48" />
             </state>
           </provider>
         </entry>
@@ -42,8 +103,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>isLun</find>
-      <find>clickLogin</find>
       <find>::</find>
       <find>changeWndNum</find>
       <find>connectRealVideo</find>
@@ -72,6 +131,8 @@
       <find>@pid</find>
       <find>itResAttachService</find>
       <find>login timeout</find>
+      <find>edit</find>
+      <find>updateTResCamera</find>
     </findStrings>
     <dirStrings>
       <dir>E:\首佳工作目录\辉南-集安\code\hnly\mybusiness\src\main\java\com\business\slfh\manager\cameramanager</dir>
@@ -103,7 +164,6 @@
         <option value="$PROJECT_DIR$/leiSP-framework/pom.xml" />
         <option value="$PROJECT_DIR$/sz_jian.iml" />
         <option value="$PROJECT_DIR$/leiSP-system/pom.xml" />
-        <option value="$PROJECT_DIR$/pom.xml" />
         <option value="$PROJECT_DIR$/leiSP-common/src/main/java/com/sooka/common/core/domain/BaseEntity.java" />
         <option value="$PROJECT_DIR$/leiSP-common/src/main/java/com/sooka/common/config/datasource/DynamicDataSourceContextHolder.java" />
         <option value="$PROJECT_DIR$/leiSP-common/src/main/java/com/sooka/common/utils/html/HTMLFilter.java" />
@@ -111,7 +171,6 @@
         <option value="$PROJECT_DIR$/leiSP-common/src/main/java/com/sooka/common/utils/poi/ExcelUtil.java" />
         <option value="$PROJECT_DIR$/leiSP-system/src/main/java/com/sooka/system/service/impl/SysDeptServiceImpl.java" />
         <option value="$PROJECT_DIR$/leiSP-system/src/main/java/com/sooka/system/service/impl/SysRoleServiceImpl.java" />
-        <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/cameramanager/index.html" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/demo_jk.js" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/css/on_off_switch.css" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/on_off_switch.js" />
@@ -124,11 +183,17 @@
         <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" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/demo.js" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/tools/JiGuangPushUtil.java" />
+        <option value="$PROJECT_DIR$/pom.xml" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/cameramanager/domain/TResCamera.java" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/cameramanager/index.html" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/cameramanager/add.html" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/cameramanager/edit.html" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/cameramanager/controller/TResCameraController.java" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/resources/mapper/grid/manager/TResCameraMapper.xml" />
       </list>
     </option>
   </component>
@@ -179,7 +244,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="AndroidView" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -195,6 +259,11 @@
             <path>
               <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
               <item name="hnly" type="462c0819:PsiDirectoryNode" />
+              <item name="leiSP-admin" 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>
@@ -246,7 +315,32 @@
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="business" type="462c0819:PsiDirectoryNode" />
               <item name="slfh" type="462c0819:PsiDirectoryNode" />
-              <item name="tools" type="462c0819:PsiDirectoryNode" />
+              <item name="manager" 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="manager" type="462c0819:PsiDirectoryNode" />
+              <item name="cameramanager" 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="manager" type="462c0819:PsiDirectoryNode" />
+              <item name="cameramanager" type="462c0819:PsiDirectoryNode" />
+              <item name="controller" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
@@ -263,14 +357,57 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="grid" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hnly" type="462c0819:PsiDirectoryNode" />
+              <item name="mybusiness" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
               <item name="templates" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hnly" type="462c0819:PsiDirectoryNode" />
+              <item name="mybusiness" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="templates" type="462c0819:PsiDirectoryNode" />
+              <item name="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="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="templates" type="462c0819:PsiDirectoryNode" />
+              <item name="business" type="462c0819:PsiDirectoryNode" />
+              <item name="manager" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hnly" type="462c0819:PsiDirectoryNode" />
+              <item name="mybusiness" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="templates" type="462c0819:PsiDirectoryNode" />
+              <item name="business" type="462c0819:PsiDirectoryNode" />
+              <item name="manager" type="462c0819:PsiDirectoryNode" />
+              <item name="cameramanager" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
       <pane id="PackagesPane" />
       <pane id="Scope" />
+      <pane id="AndroidView" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -297,121 +434,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$/mybusiness/src/main/java/com/business/slfh/app/event/service/AppEventService.java</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/app/event/service/impl/AppEventServiceImpl.java</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/app/mainpage/domain/MainPageVO.java</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/app/mainpage/service/impl/AppMainPageServiceImpl.java</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>
@@ -516,7 +538,8 @@
       <workItem from="1665359355827" duration="7320000" />
       <workItem from="1665370196293" duration="24127000" />
       <workItem from="1665447580649" duration="15844000" />
-      <workItem from="1665533158898" duration="16356000" />
+      <workItem from="1665533158898" duration="23200000" />
+      <workItem from="1665628201922" duration="904000" />
     </task>
     <task id="LOCAL-00001" summary="http">
       <created>1665216030960</created>
@@ -623,11 +646,25 @@
       <option name="project" value="LOCAL" />
       <updated>1665556716090</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="http">
+      <created>1665558192706</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1665558192706</updated>
+    </task>
+    <task id="LOCAL-00017" summary="http">
+      <created>1665558281485</created>
+      <option name="number" value="00017" />
+      <option name="presentableId" value="LOCAL-00017" />
+      <option name="project" value="LOCAL" />
+      <updated>1665558281485</updated>
+    </task>
+    <option name="localTasksCounter" value="18" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="79504000" />
+    <option name="totallyTimeSpent" value="87252000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -643,18 +680,18 @@
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info id="UI Designer" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.38333333" />
+      <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.37666667" />
       <window_info anchor="bottom" id="TODO" order="6" />
       <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" />
       <window_info anchor="right" id="Capture Analysis" order="3" />
-      <window_info anchor="bottom" id="Version Control" order="7" visible="true" weight="0.29444444" />
+      <window_info anchor="bottom" id="Version Control" order="7" weight="0.37777779" />
       <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.44042554" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.17803837" />
+      <window_info anchor="bottom" id="Terminal" order="7" weight="0.3611111" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.23134328" />
       <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" />
@@ -679,73 +716,10 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="18" />
+      <option name="time" value="22" />
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/leiSP-common/src/main/java/com/sooka/common/core/text/Convert.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="15450">
-          <caret line="560" column="24" selection-start-line="560" selection-start-column="16" selection-end-line="560" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/leiSP-common/src/main/java/com/sooka/common/utils/file/MimeTypeUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="237">
-          <caret line="45" column="19" selection-start-line="45" selection-start-column="19" selection-end-line="45" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/leiSP-common/src/main/java/com/sooka/common/utils/poi/ExcelUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="147">
-          <caret line="847" column="33" selection-start-line="847" selection-start-column="33" selection-end-line="847" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://D:/Program Files/Java/jdk1.8.0_151/src.zip!/java/util/function/Function.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-385">
-          <caret line="48" column="6" selection-start-line="48" selection-start-column="6" selection-end-line="48" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/leiSP-system/src/main/java/com/sooka/system/service/impl/SysDeptServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="155">
-          <caret line="330" column="33" selection-start-line="330" selection-start-column="33" selection-end-line="330" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/leiSP-system/src/main/java/com/sooka/system/service/impl/SysMenuServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="215">
-          <caret line="115" column="9" selection-start-line="115" selection-start-column="9" selection-end-line="115" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/leiSP-system/src/main/java/com/sooka/system/service/impl/SysRoleServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="155">
-          <caret line="75" column="42" selection-start-line="75" selection-start-column="42" selection-end-line="75" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/leiSP-quartz/src/main/java/com/sooka/quartz/util/JobInvokeUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="155">
-          <caret line="113" column="49" selection-start-line="113" selection-start-column="49" selection-end-line="113" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/leiSP-generator/src/main/java/com/sooka/generator/service/impl/GenTableServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="147">
-          <caret line="211" column="9" selection-start-line="211" selection-start-column="9" selection-end-line="211" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/leiSP-framework/src/main/java/com/sooka/framework/config/DruidConfig.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="297">
@@ -774,28 +748,6 @@
         </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">
-          <caret line="5" column="25" selection-start-line="5" selection-start-column="20" selection-end-line="5" selection-end-column="25" />
-        </state>
-      </provider>
-      <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/cameramanager/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="480">
-          <caret line="178" column="30" lean-forward="true" selection-start-line="178" selection-start-column="30" selection-end-line="178" selection-end-column="30" />
-        </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">
-          <caret line="50" column="10" lean-forward="true" selection-start-line="50" selection-start-column="10" selection-end-line="50" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/leiSP-common/src/main/java/com/sooka/common/annotation/DataScope.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="200">
@@ -923,13 +875,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="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">
@@ -941,30 +886,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <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$/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="76">
-          <caret line="401" column="16" selection-start-line="401" selection-start-column="16" selection-end-line="401" selection-end-column="16" />
         </state>
       </provider>
     </entry>
@@ -1040,8 +961,117 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/tools/JiGuangPushUtil.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="390">
+          <caret line="28" column="11" selection-start-line="28" selection-start-column="11" selection-end-line="28" selection-end-column="11" />
+        </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" lean-forward="true" selection-start-line="9" selection-start-column="5" selection-end-line="9" selection-end-column="45" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/visualization/frame.html">
+      <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="180">
-          <caret line="21" column="65" selection-start-line="21" selection-start-column="65" selection-end-line="21" selection-end-column="65" />
+          <caret line="6" column="23" lean-forward="true" selection-start-line="6" selection-start-column="23" selection-end-line="6" selection-end-column="23" />
+        </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="8010">
+          <caret line="302" column="71" selection-start-line="302" selection-start-column="71" selection-end-line="302" selection-end-column="71" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/pom.xml">
+      <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/leiSP-admin/pom.xml">
+      <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1950">
+          <caret line="5" column="25" selection-start-line="5" selection-start-column="20" selection-end-line="5" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pom.xml">
+      <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="119">
+          <caret line="269" column="31" selection-start-line="269" selection-start-column="31" selection-end-line="269" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/carmanager/domain/TResCar.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="211">
+          <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/cameramanager/domain/TResCamera.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="511">
+          <caret line="88" column="29" selection-start-line="88" selection-start-column="29" selection-end-line="88" selection-end-column="29" />
+          <folding>
+            <element signature="e#2031#2032#0" expanded="true" />
+            <element signature="e#2070#2071#0" expanded="true" />
+            <element signature="e#2100#2101#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/cameramanager/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="390">
+          <caret line="112" column="30" selection-start-line="112" selection-start-column="30" selection-end-line="112" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/cameramanager/add.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-2580">
+          <caret line="13" column="58" selection-start-line="13" selection-start-column="58" selection-end-line="13" selection-end-column="58" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/cameramanager/edit.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-4015">
+          <caret line="12" column="52" selection-start-line="12" selection-start-column="50" selection-end-line="12" selection-end-column="52" />
+        </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="177">
+          <caret line="44" selection-start-line="44" selection-end-line="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/cameramanager/controller/TResCameraController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="321">
+          <caret line="168" selection-start-line="168" selection-end-line="168" />
+        </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="350">
+          <caret line="83" column="48" selection-start-line="83" selection-start-column="32" selection-end-line="83" selection-end-column="48" />
+        </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="229">
+          <caret line="178" column="38" selection-start-line="178" selection-start-column="38" selection-end-line="178" selection-end-column="38" />
         </state>
       </provider>
     </entry>

mybusiness/src/main/java/com/business/slfh/manager/cameramanager/controller/TResCameraController.java

@@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 /**
  * 摄像头管理Controller
- * 
+ *
  * @author lei
  * @date 2020-12-24
  */
@@ -165,6 +165,7 @@ public class TResCameraController extends BaseController
     @ResponseBody
     public AjaxResult editSave(TResCamera tResCamera)
     {
+
         return toAjax(tResCameraService.updateTResCamera(tResCamera));
     }
 

mybusiness/src/main/java/com/business/slfh/manager/cameramanager/domain/TResCamera.java

@@ -38,6 +38,7 @@ public class TResCamera  extends BaseEntity implements Cloneable
     private Long createUserId;
     private String radius;
     private String supermapId;
+    private Integer seq;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
@@ -85,6 +86,13 @@ public class TResCamera  extends BaseEntity implements Cloneable
      */
     private String deptName;
 
+    public Integer getSeq() {
+        return seq;
+    }
+
+    public void setSeq(Integer seq) {
+        this.seq = seq;
+    }
 
     public Long getOrgDeptId() {
         return orgDeptId;

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

@@ -31,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createUserId"    column="create_user_id"    />
         <result property="radius"    column="radius"    />
         <result property="supermapId"    column="supermap_id"    />
+        <result property="seq"    column="seq"    />
     </resultMap>
 
     <sql id="selectTResCameraVo">
@@ -38,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         d.hik_password hik_password, d.hik_deviceport hik_deviceport, d.address address, d.id id, d.status status,
         d.remark remark, d.del_flag del_flag, d.create_by create_by, d.create_time create_time, d.update_by update_by,
          d.update_time update_time,d.name name, d.longitude longitude, d.latitude latitude, d.model model,
-         d.dept_id dept_id, d.org_dept_id org_dept_id,
+         d.dept_id dept_id, d.org_dept_id org_dept_id,d.seq,
         (select dept_name from sys_dept where dept_id=d.dept_id) dept_name,
         (select dept_name from sys_dept where dept_id=d.org_dept_id) org_dept_name
         from t_res_camera d
@@ -71,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
-        order by create_time desc
+        order by seq asc
     </select>
 
     <select id="selectTResCameraById" parameterType="String" resultMap="TResCameraResult">
@@ -118,6 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createUserId != null">create_user_id,</if>
             <if test="radius != null">radius,</if>
             <if test="supermapId != null">supermap_id,</if>
+            <if test="seq != null">seq,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -144,6 +146,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createUserId != null">#{createUserId},</if>
             <if test="radius != null">#{radius},</if>
             <if test="supermapId != null">#{supermapId},</if>
+            <if test="seq != null">#{seq},</if>
          </trim>
     </insert>
 
@@ -173,6 +176,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createUserId != null">create_user_id = #{createUserId},</if>
             <if test="radius != null">radius = #{radius},</if>
             <if test="supermapId != null">supermap_id = #{supermapId},</if>
+            <if test="seq != null">seq = #{seq},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -9,6 +9,12 @@
         <input name="deptId" type="hidden" id="deptTreeId"/>
         <input name="orgDeptId" type="hidden" id="orgTreeId"/>
         <div class="form-group">
+            <label class="col-sm-3 control-label">排序：</label>
+            <div class="col-sm-8">
+                <input maxlength="100" name="seq" value="0" class="form-control" type="text" required>
+            </div>
+        </div>
+        <div class="form-group">
             <label class="col-sm-3 control-label">名称：</label>
             <div class="col-sm-8">
                 <input maxlength="100" name="name" class="form-control" type="text" required>

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

@@ -10,6 +10,12 @@
         <input name="deptId" th:field="*{deptId}" type="hidden" id="deptTreeId"/>
         <input name="orgDeptId" th:field="*{orgDeptId}" type="hidden" id="orgTreeId"/>
         <div class="form-group">
+            <label class="col-sm-3 control-label">排序：</label>
+            <div class="col-sm-8">
+                <input maxlength="100" name="seq" th:field="*{seq}" class="form-control" type="text" required>
+            </div>
+        </div>
+        <div class="form-group">
             <label class="col-sm-3 control-label">名称：</label>
             <div class="col-sm-8">
                 <input maxlength="100" name="name" th:field="*{name}" class="form-control" type="text" required>

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

@@ -109,6 +109,10 @@
                     title: '型号'
                 },*/
                 {
+                    field: 'seq',
+                    title: '排序'
+                },
+                {
                     field: 'name',
                     title: '名称'
                 },

pom.xml

@@ -241,6 +241,7 @@
 
     <build>
 
+
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
@@ -265,6 +266,7 @@
                         </goals>
                     </execution>
                 </executions>
+
                 <configuration>
                     <archive>
                         <manifest></manifest>