http

.idea/compiler.xml

@@ -23,7 +23,7 @@
       <module name="leisp-quartz" target="7" />
       <module name="leisp-system" target="7" />
       <module name="mybusiness" target="8" />
-      <module name="sz_jian" target="1.5" />
+      <module name="sz_jian" target="1.8" />
     </bytecodeTargetLevel>
   </component>
 </project>

.idea/workspace.xml

@@ -2,11 +2,16 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="8ad4baec-f819-4a7c-b135-6a76a7a0c72f" name="Default" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
       <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$/mybusiness/src/main/java/com/business/slfh/manager/levelmanager/domain/TResLevel.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/levelmanager/domain/TResLevel.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/levelmanager/service/impl/TResLevelServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/levelmanager/service/impl/TResLevelServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/mapper/grid/manager/TResLevelMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/mapper/grid/manager/TResLevelMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/login.html" beforeDir="false" afterPath="$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/login.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/leiSP-framework/src/main/java/com/sooka/framework/config/ShiroConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/leiSP-framework/src/main/java/com/sooka/framework/config/ShiroConfig.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/controller/DahuaDsdController.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/controller/DahuaDsdController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/firemanager/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/firemanager/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/visualization/details.html" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/visualization/details.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/lib/on_off_switch.js" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/lib/on_off_switch.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/sz_jian.iml" beforeDir="false" afterPath="$PROJECT_DIR$/sz_jian.iml" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/leiSP-admin/target/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -24,7 +29,35 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file leaf-file-name="application.yml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/resources/application.yml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="275">
+              <caret line="127" column="18" selection-start-line="127" selection-start-column="4" selection-end-line="127" selection-end-column="18" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="login.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/login.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="477">
+              <caret line="51" column="18" selection-start-line="51" selection-start-column="18" selection-end-line="51" selection-end-column="18" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="login_old.html" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/login_old.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="150">
+              <caret line="44" column="46" selection-start-line="44" selection-start-column="46" selection-end-line="44" selection-end-column="46" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -36,15 +69,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>openDetailsDia</find>
-      <find>getVisualizationDetails</find>
-      <find>selectTResCameraByCameraId$</find>
-      <find>http://122.141.177.214:9090/dahua/demo-jkd.html</find>
-      <find>WHERE ischild != 0</find>
-      <find>Visualization_Event_Mapper</find>
-      <find>getVisualization_Camera</find>
-      <find>getVisualization_Camera_Count</find>
-      <find>@pid</find>
       <find>itResAttachService</find>
       <find>login timeout</find>
       <find>edit</find>
@@ -66,6 +90,15 @@
       <find>filterTResLevel</find>
       <find>addFilter</find>
       <find>recttime</find>
+      <find>无异常</find>
+      <find>add</find>
+      <find>drivingEvents</find>
+      <find>layui-layer-btn1</find>
+      <find>selectTUEventFireList</find>
+      <find>wind</find>
+      <find>验证码</find>
+      <find>captchaEnabled</find>
+      <find>用户登录</find>
     </findStrings>
     <dirStrings>
       <dir>E:\首佳工作目录\辉南-集安\code\hnly\mybusiness\src\main\java\com\business\slfh\manager\cameramanager</dir>
@@ -88,7 +121,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/leiSP-admin/src/main/resources/application-druid.yml" />
         <option value="$PROJECT_DIR$/leiSP-admin/pom.xml" />
         <option value="$PROJECT_DIR$/leiSP-common/pom.xml" />
         <option value="$PROJECT_DIR$/leiSP-generator/pom.xml" />
@@ -108,18 +140,14 @@
         <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/css/on_off_switch.css" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/on_off_switch.js" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/WebVideoCtrl.js" />
-        <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/controller/DahuaDsdController.java" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/util/DahuaUtil.java" />
-        <option value="$PROJECT_DIR$/leiSP-framework/src/main/java/com/sooka/framework/config/ShiroConfig.java" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/service/IDahuaMessageService.java" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/controller/Dahua2BController.java" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/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/java/com/business/slfh/visualization/event/controller/Visualization_Event_Controller.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/java/com/business/slfh/manager/cameramanager/controller/TResCameraController.java" />
@@ -134,8 +162,16 @@
         <option value="$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/main.html" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/levelmanager/domain/TResLevel.java" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/levelmanager/service/impl/TResLevelServiceImpl.java" />
-        <option value="$PROJECT_DIR$/leiSP-admin/src/main/resources/application.yml" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/resources/mapper/grid/manager/TResLevelMapper.xml" />
+        <option value="$PROJECT_DIR$/pom.xml" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/visualization/details.html" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/firemanager/index.html" />
+        <option value="$PROJECT_DIR$/leiSP-framework/src/main/java/com/sooka/framework/config/ShiroConfig.java" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/controller/DahuaDsdController.java" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/lib/on_off_switch.js" />
+        <option value="$PROJECT_DIR$/leiSP-admin/src/main/resources/application.yml" />
+        <option value="$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/login.html" />
+        <option value="$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/login_old.html" />
       </list>
     </option>
   </component>
@@ -175,8 +211,8 @@
     </packageJsonPaths>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-8" />
-    <option name="y" value="-8" />
+    <option name="x" value="72" />
+    <option name="y" value="67" />
     <option name="width" value="1936" />
     <option name="height" value="1056" />
   </component>
@@ -187,6 +223,7 @@
     </navigator>
     <panes>
       <pane id="AndroidView" />
+      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -223,26 +260,7 @@
               <item name="leiSP-admin" 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-admin" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" 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" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="web" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
@@ -251,13 +269,13 @@
               <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>
           </expand>
           <select />
         </subPane>
       </pane>
       <pane id="Scope" />
-      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -268,7 +286,7 @@
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
     <property name="dynamic.classpath" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../../数字集安/code/jian" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="project.structure.last.edited" value="Project" />
@@ -298,7 +316,10 @@
           <option name="mySupportsDeletion" value="false" />
           <option name="myCanBeAbsent" value="false" />
           <option name="myId" value="UPDATED" />
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/leiSP-admin/src/main/resources/static/css/style.css</PATH>
           <PATH vcs="Git" revision="">$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/index.html</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/service/impl/Visualization_Event_Service_Impl.java</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/mybusiness/src/main/resources/mapper/grid/visualization/Visualization_Event_Mapper.xml</PATH>
           <PATH vcs="Git" revision="">$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/visualization/event.html</PATH>
         </FILE-GROUP>
         <FILE-GROUP>
@@ -501,7 +522,10 @@
       <workItem from="1665447580649" duration="15844000" />
       <workItem from="1665533158898" duration="23200000" />
       <workItem from="1665628201922" duration="10691000" />
-      <workItem from="1665709592040" duration="14992000" />
+      <workItem from="1665709592040" duration="15031000" />
+      <workItem from="1665801242192" duration="1888000" />
+      <workItem from="1665991581016" duration="6194000" />
+      <workItem from="1666053602923" duration="4830000" />
     </task>
     <task id="LOCAL-00001" summary="http">
       <created>1665216030960</created>
@@ -636,18 +660,26 @@
       <option name="project" value="LOCAL" />
       <updated>1665720390593</updated>
     </task>
-    <option name="localTasksCounter" value="20" />
+    <task id="LOCAL-00020" summary="http">
+      <created>1665738568085</created>
+      <option name="number" value="00020" />
+      <option name="presentableId" value="LOCAL-00020" />
+      <option name="project" value="LOCAL" />
+      <updated>1665738568085</updated>
+    </task>
+    <option name="localTasksCounter" value="21" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="112031000" />
+    <option name="totallyTimeSpent" value="124982000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+    <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
-      <window_info anchor="right" id="Maven Projects" order="3" visible="true" weight="0.2196162" />
+      <window_info anchor="right" id="Maven Projects" order="3" visible="true" weight="0.07409382" />
       <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
       <window_info id="Capture Tool" order="2" />
       <window_info id="Designer" order="2" />
@@ -655,18 +687,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 active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.35777777" />
+      <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.34444445" />
       <window_info anchor="bottom" id="TODO" order="6" />
       <window_info anchor="bottom" id="Messages" order="7" weight="0.4211111" />
       <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" weight="0.3617021" />
+      <window_info anchor="bottom" id="Version Control" order="7" weight="0.51111114" />
       <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.42333335" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.22014925" />
+      <window_info anchor="bottom" id="Terminal" order="7" weight="0.36888888" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24840085" />
       <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" />
@@ -698,116 +730,11 @@
           <properties />
           <option name="timeStamp" value="24" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/levelmanager/service/impl/TResLevelServiceImpl.java</url>
-          <line>77</line>
-          <properties />
-          <option name="timeStamp" value="36" />
-        </line-breakpoint>
       </breakpoints>
       <option name="time" value="37" />
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <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="1069">
-          <caret line="176" column="62" selection-start-line="176" selection-start-column="62" selection-end-line="176" selection-end-column="62" />
-        </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="270">
-          <caret line="39" column="52" selection-start-line="39" selection-start-column="52" selection-end-line="39" selection-end-column="52" />
-        </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="123">
-          <caret line="55" column="32" selection-start-line="55" selection-start-column="32" selection-end-line="55" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="269">
-          <caret line="289" column="24" selection-start-line="289" selection-start-column="24" selection-end-line="289" selection-end-column="24" />
-        </state>
-      </provider>
-      <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/bigdata/inspection.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="250">
-          <caret line="205" column="101" selection-start-line="205" selection-start-column="101" selection-end-line="205" selection-end-column="101" />
-        </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="60">
-          <caret line="182" column="9" lean-forward="true" selection-start-line="182" selection-start-column="9" selection-end-line="182" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/controller/Visualization_Event_Controller.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="398">
-          <caret line="137" column="81" selection-start-line="137" selection-start-column="81" selection-end-line="137" selection-end-column="81" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/service/Visualization_Event_Service.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="228">
-          <caret line="14" column="8" selection-start-line="14" selection-start-column="8" selection-end-line="14" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/mapper/grid/visualization/Visualization_Event_Mapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="415">
-          <caret line="301" lean-forward="true" selection-start-line="301" selection-end-line="301" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/service/impl/Visualization_Event_Service_Impl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="408">
-          <caret line="58" column="20" lean-forward="true" selection-start-line="58" selection-start-column="20" selection-end-line="58" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/controller/Dahua2BController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="600">
-          <caret line="26" column="21" selection-start-line="26" selection-start-column="21" selection-end-line="26" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://D:/Program Files/Java/jdk1.8.0_151/src.zip!/java/lang/Thread.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="376">
-          <caret line="747" selection-start-line="747" selection-end-line="747" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/stationlandmanager/controller/TResStationlandController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="450">
-          <caret line="35" lean-forward="true" selection-start-line="35" selection-end-line="35" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/othersmanager/index.html">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -828,13 +755,6 @@
         <state relative-caret-position="-3690" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/firemanager/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="206">
-          <caret line="119" column="75" selection-start-line="119" selection-start-column="52" selection-end-line="119" selection-end-column="75" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/firereportmanager/index.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-900">
@@ -889,13 +809,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/stationlandmanager/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-510">
-          <caret line="10" column="32" selection-start-line="10" selection-start-column="32" selection-end-line="10" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/policiesmanager/controller/TResPoliciesController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="240">
@@ -934,13 +847,6 @@
     <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/visualization/event.html">
       <provider selected="true" editor-type-id="text-editor" />
     </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="8" 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/java/com/business/slfh/dahua/service/impl/DaHuaMessageServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="427">
@@ -978,12 +884,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="383">
           <caret line="126" column="37" lean-forward="true" selection-start-line="126" selection-start-column="37" selection-end-line="126" selection-end-column="37" />
-          <folding>
-            <element signature="e#2982#2983#0" expanded="true" />
-            <element signature="e#3016#3017#0" expanded="true" />
-            <element signature="e#3070#3071#0" expanded="true" />
-            <element signature="e#3116#3117#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -992,24 +892,153 @@
         <state relative-caret-position="-962" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/resources/application.yml">
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/mapper/grid/manager/TResLevelMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="125">
-          <caret line="56" column="49" selection-start-line="56" selection-start-column="49" selection-end-line="56" selection-end-column="49" />
+        <state relative-caret-position="300">
+          <caret line="46" column="35" lean-forward="true" selection-start-line="46" selection-start-column="35" selection-end-line="46" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="306" column="25" selection-start-line="306" selection-start-column="25" selection-end-line="306" selection-end-column="25" />
         </state>
       </provider>
+      <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
     <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/levelmanager/service/impl/TResLevelServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="98">
-          <caret line="82" selection-start-line="82" selection-end-line="82" />
+        <state relative-caret-position="2010">
+          <caret line="80" column="37" selection-start-line="80" selection-start-column="37" selection-end-line="80" selection-end-column="37" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/mapper/grid/manager/TResLevelMapper.xml">
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/firemanager/confirm.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="46" column="35" lean-forward="true" selection-start-line="46" selection-start-column="35" selection-end-line="46" selection-end-column="35" />
+        <state relative-caret-position="-1170" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/stationweathermanager/add.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1707" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/stationlandmanager/add.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1020">
+          <caret line="85" column="31" lean-forward="true" selection-start-line="85" selection-start-column="12" selection-end-line="85" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/stationlandmanager/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="420">
+          <caret line="29" column="103" selection-start-line="29" selection-start-column="87" selection-end-line="29" selection-end-column="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/visualization/details.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="318" column="19" lean-forward="true" selection-start-line="318" selection-start-column="19" selection-end-line="318" selection-end-column="19" />
+          <folding>
+            <element signature="n#style#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/firemanager/service/impl/TUEventFireServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="223">
+          <caret line="87" column="54" selection-start-line="87" selection-start-column="33" selection-end-line="87" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/mapper/grid/manager/TUEventFireMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-537">
+          <caret line="55" column="37" selection-start-line="55" selection-start-column="16" selection-end-line="55" selection-end-column="37" />
+        </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="321">
+          <caret line="97" column="64" lean-forward="true" selection-start-line="97" selection-start-column="64" selection-end-line="97" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/firemanager/service/ITUEventFireService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="201">
+          <caret line="34" column="29" selection-start-line="34" selection-start-column="29" selection-end-line="34" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/firemanager/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="356">
+          <caret line="132" column="28" lean-forward="true" selection-start-line="132" selection-start-column="28" selection-end-line="132" selection-end-column="28" />
+          <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$/leiSP-framework/src/main/java/com/sooka/framework/config/ShiroConfig.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="411">
+          <caret line="296" column="57" selection-start-line="296" selection-start-column="39" selection-end-line="296" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/controller/DahuaDsdController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" 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="39" 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/dahua/lib/on_off_switch.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="51" column="56" selection-start-line="51" selection-start-column="56" selection-end-line="51" selection-end-column="56" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/resources/application.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="275">
+          <caret line="127" column="18" selection-start-line="127" selection-start-column="4" selection-end-line="127" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/login.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="477">
+          <caret line="51" column="18" selection-start-line="51" selection-start-column="18" selection-end-line="51" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/login_old.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="150">
+          <caret line="44" column="46" selection-start-line="44" selection-start-column="46" selection-end-line="44" selection-end-column="46" />
         </state>
       </provider>
     </entry>

leiSP-admin/src/main/resources/templates/login.html

@@ -40,6 +40,16 @@
                 <i><img src="../static/syslogin/lydl_5.png" th:src="@{/syslogin/lydl_5.png}"/></i>
                 <input name="password"  placeholder="请输入密码" type="password" />
             </div>
+            <div class="row m-t" th:if="${captchaEnabled==true}">
+                <div class="col-xs-6">
+                    <input type="text" name="validateCode" class="form-control code" placeholder="验证码" maxlength="5" />
+                </div>
+                <div class="col-xs-6">
+                    <a href="javascript:void(0);" title="点击更换验证码">
+                        <img th:src="@{captcha/captchaImage(type=${captchaType})}" class="imgcode" width="85%"/>
+                    </a>
+                </div>
+            </div>
             <!--<div class="yhm_div clearfix">-->
                 <!--<a class="fl">找回密码</a>-->
                 <!--<label class="fr"><input type="checkbox" checked/><span>记住用户名</span></label>-->

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

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

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

@@ -1,11 +1,27 @@
 package com.business.slfh.dahua.controller;
 
+import com.sooka.system.service.ISysConfigService;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
+
 @RestController
 @RequestMapping("DahuaDsdController")
 public class DahuaDsdController {
 
+    @Resource
+    ISysConfigService iSysConfigService;
+
     //5122. 5131. 302
+    @RequestMapping("getDsdInfo")
+    public Map getDsdInfo(){
+        Map map = new HashMap();
+        String dsd_flush_time = iSysConfigService.selectConfigByKey("dsd_flush_time");
+        map.put("dsd_flush_time",dsd_flush_time);
+        return map;
+    }
+
 }

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

@@ -120,8 +120,22 @@
             var prefix = ctx + "visualization/event/getVisualizationDetails?eventId="+eventId+"&reservePlanType=reserveplan_type_1";
             //$.modal.openTab('火情信息', prefix,$(document).width(),$(document).height());
             $.modal.open('火情信息', prefix,$(document).width(),$(document).height());
+
+            $(".layui-layer-btn1").click(function () {
+                setTimeout(function(){
+                    parent.window.location.reload();//父页面刷新
+                    window.location.reload();//页面刷新
+                },500);
+            })
+
         }
 
+        function myflush() {
+            parent.location.reload()
+        }
+
+
+
         var report_typeDict = [[${@dict.getType('report_type')}]];
         var event_statusDict = [[${@dict.getType('event_status')}]];
         var reserveplan_levelDict = [[${@dict.getType('reserveplan_level')}]];

mybusiness/src/main/resources/templates/business/visualization/details.html

@@ -314,11 +314,17 @@
             }else{
                 drivingOthersEvents(confirm_action,obj);
             }
-            parent.$(".layui-layer-btn1").click()
+
+            parent.$(".layui-layer-btn1").click();
             return;
         }
         $.modal.openOptions(options);
     }
+
+
+
+
+
     function doSubmitConfirm(index, layero){
         var body = layer.getChildFrame('body', index);
 

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

@@ -45,8 +45,16 @@ function lunbo() {
     console.log("video_team:", video_team)
     team_index = 0;
 
-    startPlayVideo()
-    intercalHanler = window.setInterval(changeTeam, 40000)
+    $.ajax({
+        url :"http://117.78.49.164:9091/DahuaDsdController/getDsdInfo",
+        success:function (e) {
+            startPlayVideo()
+            var time = parseInt(e.dsd_flush_time)*60000;
+            intercalHanler = window.setInterval(changeTeam, time)
+        }
+    })
+
+
 }
 
 function sleep1(ms, callback) {

pom.xml

@@ -241,7 +241,6 @@
 
     <build>
 
-
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
@@ -256,59 +255,30 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.6</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
                 <configuration>
-                    <archive>
-                        <manifest></manifest>
-                    </archive>
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                    <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
             </plugin>
 
-
+            <!--孙一石 注释 打包问题-->
             <!--<plugin>-->
-                <!--<groupId>org.apache.maven.plugins</groupId>-->
-                <!--<artifactId>maven-compiler-plugin</artifactId>-->
-                <!--<version>3.1</version>-->
-                <!--<configuration>-->
-                    <!--<source>${java.version}</source>-->
-                    <!--<target>${java.version}</target>-->
-                    <!--<encoding>${project.build.sourceEncoding}</encoding>-->
-                <!--</configuration>-->
+            <!--<groupId>org.springframework.boot</groupId>-->
+            <!--<artifactId>spring-boot-maven-plugin</artifactId>-->
             <!--</plugin>-->
-
-            <!--&lt;!&ndash;孙一石 注释 打包问题&ndash;&gt;-->
-            <!--&lt;!&ndash;<plugin>&ndash;&gt;-->
-            <!--&lt;!&ndash;<groupId>org.springframework.boot</groupId>&ndash;&gt;-->
-            <!--&lt;!&ndash;<artifactId>spring-boot-maven-plugin</artifactId>&ndash;&gt;-->
-            <!--&lt;!&ndash;</plugin>&ndash;&gt;-->
-            <!--<plugin>-->
-                <!--<groupId>org.apache.maven.plugins</groupId>-->
-                <!--<artifactId>maven-surefire-plugin</artifactId>-->
-                <!--<configuration>-->
-                    <!--<skip>true</skip>-->
-                <!--</configuration>-->
-            <!--</plugin>-->
-        </plugins>
-
-
-
-
-
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
 
 
+        </plugins>
     </build>
 
     <repositories>

sz_jian.iml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">