Administrator 2 年之前
父節點
當前提交
e44ef5b9aa

+ 299 - 339
.idea/workspace.xml

@@ -3,11 +3,15 @@
   <component name="ChangeListManager">
     <list default="true" id="8ad4baec-f819-4a7c-b135-6a76a7a0c72f" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/index.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/othersmanager/service/impl/TUEventOthersServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/othersmanager/service/impl/TUEventOthersServiceImpl.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/manager/othersmanager/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/othersmanager/index.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/taskmanager/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/taskmanager/add.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/system/notice/notice.html" beforeDir="false" afterPath="$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/system/notice/notice.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/app/event/service/impl/AppEventServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/app/event/service/impl/AppEventServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/policiesmanager/service/impl/TResPoliciesServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/policiesmanager/service/impl/TResPoliciesServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/reserveplanmanager/service/impl/TBusReserveplanServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/reserveplanmanager/service/impl/TBusReserveplanServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/controller/Visualization_Event_Controller.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/controller/Visualization_Event_Controller.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/policiesmanager/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/policiesmanager/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/reserveplanmanager/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/reserveplanmanager/add.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/reserveplanmanager/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/reserveplanmanager/edit.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/reserveplanmanager/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/reserveplanmanager/index.html" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/leiSP-admin/target/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -27,101 +31,74 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/othersmanager/index.html">
+        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/reserveplanmanager/index.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1328">
-              <caret line="301" column="25" selection-start-line="301" selection-start-column="25" selection-end-line="301" selection-end-column="25" />
-              <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 relative-caret-position="287">
+              <caret line="140" column="58" lean-forward="true" selection-start-line="140" selection-start-column="24" selection-end-line="140" selection-end-column="58" />
             </state>
           </provider>
         </entry>
       </file>
       <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/index.html">
+        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/policiesmanager/index.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="21">
-              <caret line="301" column="31" lean-forward="true" selection-start-line="301" selection-start-column="31" selection-end-line="301" selection-end-column="31" />
+            <state relative-caret-position="480">
+              <caret line="196" column="25" selection-start-line="196" selection-start-column="25" selection-end-line="196" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="TResStationweatherController.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/stationweathermanager/controller/TResStationweatherController.java">
+      <file leaf-file-name="SysNoticeController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/java/com/sooka/web/controller/system/SysNoticeController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="434">
-              <caret line="100" column="17" lean-forward="true" selection-start-line="100" selection-start-column="17" selection-end-line="100" selection-end-column="17" />
+            <state relative-caret-position="415">
+              <caret line="89" column="26" selection-start-line="89" selection-start-column="15" selection-end-line="89" selection-end-column="26" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="SysProfileController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/java/com/sooka/web/controller/system/SysProfileController.java">
+      <file leaf-file-name="TBusReserveplanServiceImpl.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/reserveplanmanager/service/impl/TBusReserveplanServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="189">
-              <caret line="31" column="18" selection-start-line="31" selection-start-column="18" selection-end-line="31" selection-end-column="18" />
-            </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/firemanager/index.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-156">
-              <caret line="291" column="31" selection-start-line="291" selection-start-column="31" selection-end-line="291" selection-end-column="31" />
+            <state relative-caret-position="246">
+              <caret line="92" column="46" lean-forward="true" selection-start-line="91" selection-start-column="8" selection-end-line="92" selection-end-column="46" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="SendMessageServiceImpl.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/tools/service/impl/SendMessageServiceImpl.java">
+      <file leaf-file-name="TResPoliciesServiceImpl.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/policiesmanager/service/impl/TResPoliciesServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="198">
-              <caret line="57" column="27" selection-start-line="57" selection-start-column="15" selection-end-line="57" selection-end-column="27" />
+            <state relative-caret-position="325">
+              <caret line="60" column="20" selection-start-line="60" selection-start-column="20" selection-end-line="60" selection-end-column="20" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="TUEventOthersServiceImpl.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/othersmanager/service/impl/TUEventOthersServiceImpl.java">
+      <file leaf-file-name="SysLoginController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/java/com/sooka/web/controller/system/SysLoginController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="115" column="68" selection-start-line="115" selection-start-column="68" selection-end-line="115" selection-end-column="68" />
+            <state relative-caret-position="253">
+              <caret line="68" column="52" selection-start-line="68" selection-start-column="39" selection-end-line="68" selection-end-column="52" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="package.bat" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/bin/package.bat">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="270">
-              <caret line="9" column="45" selection-start-line="9" selection-start-column="5" selection-end-line="9" selection-end-column="45" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="SendMessageService.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/tools/service/SendMessageService.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="150">
-              <caret line="7" selection-start-line="7" selection-end-line="7" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="ITUEventOthersService.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/othersmanager/service/ITUEventOthersService.java">
+      <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/firemanager/index.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="206">
-              <caret line="47" column="15" selection-start-line="47" selection-start-column="15" selection-end-line="47" selection-end-column="15" />
+            <state relative-caret-position="7087">
+              <caret line="291" column="31" selection-start-line="291" selection-start-column="31" selection-end-line="291" selection-end-column="31" />
+              <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>
@@ -138,11 +115,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>森林防火</find>
-      <find>ZRS</find>
-      <find>防火检查站</find>
-      <find>jgfs</find>
-      <find>getVisualizationEvent</find>
       <find>Visualization_Pending_List</find>
       <find>params</find>
       <find>指派任务</find>
@@ -168,6 +140,11 @@
       <find>resetPwd</find>
       <find>system/user/profile</find>
       <find>passwordRe</find>
+      <find>queryAppEventDetail</find>
+      <find>http://122</find>
+      <find>119.52.253</find>
+      <find>dahua_picture_url</find>
+      <find>插件下载</find>
     </findStrings>
     <dirStrings>
       <dir>E:\首佳工作目录\辉南-集安\code\hnly\mybusiness\src\main\java\com\business\slfh\manager\cameramanager</dir>
@@ -190,13 +167,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <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/dahua/module/demo_jk.js" />
-        <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/css/on_off_switch.css" />
-        <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/on_off_switch.js" />
-        <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/WebVideoCtrl.js" />
-        <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/util/DahuaUtil.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" />
@@ -207,7 +177,6 @@
         <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" />
         <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/business/manager/policiesmanager/index.html" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/waterintake/index.html" />
         <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" />
@@ -233,7 +202,6 @@
         <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/service/Visualization_Event_Service.java" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/visualization/ry.html" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/mapper/Visualization_Event_Mapper.java" />
-        <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/controller/Visualization_Event_Controller.java" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/service/impl/Visualization_Event_Service_Impl.java" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/resources/mapper/grid/visualization/Visualization_Event_Mapper.xml" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/taskmanager/add.html" />
@@ -241,6 +209,15 @@
         <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/othersmanager/service/impl/TUEventOthersServiceImpl.java" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/othersmanager/index.html" />
         <option value="$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/index.html" />
+        <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/app/event/service/impl/AppEventServiceImpl.java" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/reserveplanmanager/add.html" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/reserveplanmanager/edit.html" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/reserveplanmanager/service/impl/TBusReserveplanServiceImpl.java" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/reserveplanmanager/index.html" />
+        <option value="$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/system/notice/notice.html" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/policiesmanager/index.html" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/policiesmanager/service/impl/TResPoliciesServiceImpl.java" />
       </list>
     </option>
   </component>
@@ -280,10 +257,10 @@
     </packageJsonPaths>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="1912" />
+    <option name="x" value="-8" />
     <option name="y" value="-8" />
     <option name="width" value="1936" />
-    <option name="height" value="1096" />
+    <option name="height" value="1056" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -308,28 +285,115 @@
             <path>
               <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
               <item name="hnly" type="462c0819:PsiDirectoryNode" />
-              <item name="mybusiness" 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" />
+              <item name="leiSP-admin" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
               <item name="hnly" type="462c0819:PsiDirectoryNode" />
-              <item name="mybusiness" type="462c0819:PsiDirectoryNode" />
+              <item name="leiSP-admin" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
               <item name="hnly" type="462c0819:PsiDirectoryNode" />
-              <item name="mybusiness" 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" />
+            </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" />
+            </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="controller" 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="controller" type="462c0819:PsiDirectoryNode" />
+              <item name="system" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hnly" type="462c0819:PsiDirectoryNode" />
+              <item name="leiSP-admin" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" 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="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="leiSP-admin" 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="system" 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>
+              <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" />
+            </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" />
             </path>
             <path>
               <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
@@ -338,7 +402,6 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="business" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
@@ -348,7 +411,6 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="business" type="462c0819:PsiDirectoryNode" />
-              <item name="slfh" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
@@ -359,7 +421,6 @@
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="business" type="462c0819:PsiDirectoryNode" />
               <item name="slfh" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
@@ -371,7 +432,6 @@
               <item name="business" type="462c0819:PsiDirectoryNode" />
               <item name="slfh" type="462c0819:PsiDirectoryNode" />
               <item name="manager" type="462c0819:PsiDirectoryNode" />
-              <item name="stationweathermanager" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
@@ -383,8 +443,7 @@
               <item name="business" type="462c0819:PsiDirectoryNode" />
               <item name="slfh" type="462c0819:PsiDirectoryNode" />
               <item name="manager" type="462c0819:PsiDirectoryNode" />
-              <item name="stationweathermanager" type="462c0819:PsiDirectoryNode" />
-              <item name="controller" type="462c0819:PsiDirectoryNode" />
+              <item name="policiesmanager" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
@@ -395,7 +454,9 @@
               <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" />
+              <item name="policiesmanager" type="462c0819:PsiDirectoryNode" />
+              <item name="service" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
@@ -403,7 +464,13 @@
               <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="java" type="462c0819:PsiDirectoryNode" />
+              <item name="business" type="462c0819:PsiDirectoryNode" />
+              <item name="slfh" type="462c0819:PsiDirectoryNode" />
+              <item name="manager" type="462c0819:PsiDirectoryNode" />
+              <item name="policiesmanager" type="462c0819:PsiDirectoryNode" />
+              <item name="service" type="462c0819:PsiDirectoryNode" />
+              <item name="impl" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
@@ -412,7 +479,6 @@
               <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" />
@@ -422,7 +488,6 @@
               <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" />
@@ -433,7 +498,6 @@
               <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" />
@@ -445,7 +509,6 @@
               <item name="templates" type="462c0819:PsiDirectoryNode" />
               <item name="business" type="462c0819:PsiDirectoryNode" />
               <item name="manager" type="462c0819:PsiDirectoryNode" />
-              <item name="firemanager" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
@@ -457,7 +520,7 @@
               <item name="templates" type="462c0819:PsiDirectoryNode" />
               <item name="business" type="462c0819:PsiDirectoryNode" />
               <item name="manager" type="462c0819:PsiDirectoryNode" />
-              <item name="othersmanager" type="462c0819:PsiDirectoryNode" />
+              <item name="policiesmanager" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
@@ -494,120 +557,6 @@
       <recent name="E:\首佳工作目录\辉南-集安\code\hnly\mybusiness\src\main\resources\templates\dahua\lib" />
     </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/visualization/event/controller/Visualization_Event_Controller.java</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/mapper/Visualization_Event_Mapper.java</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/service/Visualization_Event_Service.java</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>
-        </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>
@@ -720,6 +669,7 @@
       <workItem from="1666053602923" duration="14423000" />
       <workItem from="1666139559736" duration="14391000" />
       <workItem from="1666225933852" duration="13742000" />
+      <workItem from="1666314953735" duration="9721000" />
     </task>
     <task id="LOCAL-00001" summary="http">
       <created>1665216030960</created>
@@ -889,11 +839,18 @@
       <option name="project" value="LOCAL" />
       <updated>1666164048987</updated>
     </task>
-    <option name="localTasksCounter" value="25" />
+    <task id="LOCAL-00025" summary="http">
+      <created>1666315028081</created>
+      <option name="number" value="00025" />
+      <option name="presentableId" value="LOCAL-00025" />
+      <option name="project" value="LOCAL" />
+      <updated>1666315028081</updated>
+    </task>
+    <option name="localTasksCounter" value="26" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="162708000" />
+    <option name="totallyTimeSpent" value="172429000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -901,7 +858,7 @@
     <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.07409382" />
+      <window_info anchor="right" id="Maven Projects" order="3" visible="true" weight="0.20469083" />
       <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" />
@@ -909,9 +866,9 @@
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info id="UI Designer" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.49888888" />
+      <window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.28333333" />
       <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Messages" order="7" weight="0.42021278" />
+      <window_info anchor="bottom" id="Messages" order="7" weight="0.42" />
       <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" />
@@ -919,8 +876,8 @@
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.39148936" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.40555555" />
       <window_info anchor="bottom" id="Spring" order="7" />
-      <window_info anchor="bottom" id="Terminal" order="7" visible="true" weight="0.32" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2196162" />
+      <window_info anchor="bottom" id="Terminal" order="7" weight="0.5233333" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2217484" />
       <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" />
@@ -953,101 +910,10 @@
           <option name="timeStamp" value="41" />
         </line-breakpoint>
       </breakpoints>
-      <option name="time" value="80" />
+      <option name="time" value="89" />
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/java/com/sooka/web/controller/system/SysRegisterController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="305">
-          <caret line="42" column="42" lean-forward="true" selection-start-line="42" selection-start-column="42" selection-end-line="42" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/leiSP-framework/src/main/java/com/sooka/framework/util/UserPasswordR.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="4" column="60" selection-start-line="4" selection-start-column="60" selection-end-line="4" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/leiSP-framework/src/main/java/com/sooka/framework/shiro/service/SysRegisterService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="11">
-          <caret line="36" column="26" selection-start-line="36" selection-start-column="18" selection-end-line="36" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/java/com/sooka/web/controller/system/SysUserController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="368">
-          <caret line="153" column="21" lean-forward="true" selection-start-line="153" selection-start-column="21" selection-end-line="153" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/stationteammanager/controller/TResStationteamController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="329">
-          <caret line="39" column="51" selection-start-line="39" selection-start-column="28" selection-end-line="39" selection-end-column="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/resources/application-druid.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="360">
-          <caret line="12" column="36" lean-forward="true" selection-start-line="12" selection-start-column="36" selection-end-line="12" selection-end-column="36" />
-        </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="255">
-          <caret line="129" column="43" selection-start-line="129" selection-start-column="43" selection-end-line="129" selection-end-column="43" />
-        </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="150">
-          <caret line="106" column="44" selection-start-line="106" selection-start-column="39" selection-end-line="106" selection-end-column="44" />
-        </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="210">
-          <caret line="178" column="33" selection-start-line="178" selection-start-column="33" selection-end-line="178" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/domain/Visualization_User.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
-        </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="263">
-          <caret line="16" column="27" selection-start-line="16" selection-start-column="18" selection-end-line="16" selection-end-column="27" />
-        </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="181">
-          <caret line="103" column="70" lean-forward="true" selection-start-line="103" selection-start-column="44" selection-end-line="103" selection-end-column="70" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/domain/Visualization_Camera_Count.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/visualization/ry.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="349">
@@ -1140,13 +1006,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/controller/Visualization_Event_Controller.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="335">
-          <caret line="149" column="110" selection-start-line="149" selection-start-column="110" selection-end-line="149" selection-end-column="110" />
-        </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="10770">
@@ -1243,7 +1102,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/othersmanager/service/ITUEventOthersService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="206">
+        <state relative-caret-position="1320">
           <caret line="47" column="15" selection-start-line="47" selection-start-column="15" selection-end-line="47" selection-end-column="15" />
         </state>
       </provider>
@@ -1257,18 +1116,56 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/tools/service/impl/SendMessageServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
+        <state relative-caret-position="870">
           <caret line="57" column="27" selection-start-line="57" selection-start-column="15" selection-end-line="57" selection-end-column="27" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/othersmanager/service/impl/TUEventOthersServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
+        <state relative-caret-position="2880">
           <caret line="115" column="68" selection-start-line="115" selection-start-column="68" selection-end-line="115" selection-end-column="68" />
         </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">
+        <state relative-caret-position="9030">
+          <caret line="301" column="25" selection-start-line="301" selection-start-column="25" selection-end-line="301" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/java/com/sooka/web/controller/system/SysProfileController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="300">
+          <caret line="31" column="18" selection-start-line="31" selection-start-column="18" selection-end-line="31" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/stationweathermanager/controller/TResStationweatherController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="390">
+          <caret line="112" column="5" lean-forward="true" selection-start-line="112" selection-start-column="5" selection-end-line="112" selection-end-column="5" />
+          <folding>
+            <element signature="e#2930#2950#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/app/event/controller/AppEventController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="237">
+          <caret line="76" column="41" selection-start-line="76" selection-start-column="41" selection-end-line="76" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/app/event/service/AppEventService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="147">
+          <caret line="13" column="24" selection-start-line="13" selection-start-column="24" selection-end-line="13" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/bin/package.bat">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="270">
@@ -1276,17 +1173,45 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/firemanager/index.html">
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/util/DahuaUtil.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-156">
-          <caret line="291" column="31" selection-start-line="291" selection-start-column="31" selection-end-line="291" selection-end-column="31" />
+        <state relative-caret-position="382">
+          <caret line="19" column="45" lean-forward="true" selection-start-line="19" selection-start-column="45" selection-end-line="19" selection-end-column="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/othersmanager/index.html">
+    <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="1328">
-          <caret line="301" column="25" selection-start-line="301" selection-start-column="25" selection-end-line="301" selection-end-column="25" />
+        <state relative-caret-position="300">
+          <caret line="197" column="42" lean-forward="true" selection-start-line="197" selection-start-column="42" selection-end-line="197" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/app/event/service/impl/AppEventServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="343" selection-start-line="343" selection-end-line="343" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/reserveplanmanager/edit.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="202">
+          <caret line="77" column="22" lean-forward="true" selection-start-line="63" selection-start-column="11" selection-end-line="77" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="244">
+          <caret line="212" column="101" selection-start-line="212" selection-start-column="52" selection-end-line="212" selection-end-column="101" />
+        </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="7087">
+          <caret line="291" column="31" selection-start-line="291" selection-start-column="31" selection-end-line="291" selection-end-column="31" />
           <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" />
@@ -1300,24 +1225,59 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/java/com/sooka/web/controller/system/SysProfileController.java">
+    <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/java/com/sooka/web/controller/system/SysLoginController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="189">
-          <caret line="31" column="18" selection-start-line="31" selection-start-column="18" selection-end-line="31" selection-end-column="18" />
+        <state relative-caret-position="253">
+          <caret line="68" column="52" selection-start-line="68" selection-start-column="39" selection-end-line="68" selection-end-column="52" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/index.html">
+    <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/java/com/sooka/web/controller/system/SysNoticeController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="21">
-          <caret line="301" column="31" lean-forward="true" selection-start-line="301" selection-start-column="31" selection-end-line="301" selection-end-column="31" />
+        <state relative-caret-position="415">
+          <caret line="89" column="26" selection-start-line="89" selection-start-column="15" selection-end-line="89" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/stationweathermanager/controller/TResStationweatherController.java">
+    <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/system/notice/notice.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="360">
+          <caret line="119" column="25" selection-start-line="119" selection-start-column="25" selection-end-line="119" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/reserveplanmanager/add.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="83" column="15" lean-forward="true" selection-start-line="83" selection-start-column="15" selection-end-line="83" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/reserveplanmanager/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="287">
+          <caret line="140" column="58" lean-forward="true" selection-start-line="140" selection-start-column="24" selection-end-line="140" selection-end-column="58" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/policiesmanager/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="480">
+          <caret line="196" column="25" selection-start-line="196" selection-start-column="25" selection-end-line="196" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/reserveplanmanager/service/impl/TBusReserveplanServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="246">
+          <caret line="92" column="46" lean-forward="true" selection-start-line="91" selection-start-column="8" selection-end-line="92" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/policiesmanager/service/impl/TResPoliciesServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="434">
-          <caret line="100" column="17" lean-forward="true" selection-start-line="100" selection-start-column="17" selection-end-line="100" selection-end-column="17" />
+        <state relative-caret-position="325">
+          <caret line="60" column="20" selection-start-line="60" selection-start-column="20" selection-end-line="60" selection-end-column="20" />
         </state>
       </provider>
     </entry>

+ 114 - 105
leiSP-admin/src/main/resources/templates/system/notice/notice.html

@@ -1,120 +1,129 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
-	<th:block th:include="include :: header('通知公告列表')" />
+    <th:block th:include="include :: header('通知公告列表')"/>
 </head>
 <body class="gray-bg">
 <div class="container-div">
 
 
-		<div class="row">
-			<div class="col-sm-12 search-collapse">
-				<form id="notice-form">
-					<div class="select-list">
-						<ul>
-							<li>
-								公告标题:<input type="text" name="noticeTitle"/>
-							</li>
-							<li>
-								操作人员:<input type="text" name="createBy"/>
-							</li>
-							<li>
-								公告类型:<select name="noticeType" th:with="type=${@dict.getType('sys_notice_type')}">
-									<option value="">所有</option>
-									<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-								</select>
-							</li>
-							<li>
-								<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-								<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-							</li>
-						</ul>
-					</div>
-				</form>
-			</div>
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="notice-form">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            公告标题:<input type="text" name="noticeTitle"/>
+                        </li>
+                        <li>
+                            操作人员:<input type="text" name="createBy"/>
+                        </li>
+                        <li>
+                            公告类型:<select name="noticeType" th:with="type=${@dict.getType('sys_notice_type')}">
+                            <option value="">所有</option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
+                                    th:value="${dict.dictValue}"></option>
+                        </select>
+                        </li>
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                                    class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+                                    class="fa fa-refresh"></i>&nbsp;重置</a>
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
 
-	        <div class="btn-group-sm" id="toolbar" role="group">
-		        <a class="btn btn-success" onclick="$.operate.addFull()" shiro:hasPermission="system:notice:add">
-		            <i class="fa fa-plus"></i> 新增
-		        </a>
-		        <a class="btn btn-primary single disabled" onclick="$.operate.editFull()" shiro:hasPermission="system:notice:edit">
-		            <i class="fa fa-edit"></i> 修改
-		        </a>
-		        <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:notice:remove">
-		            <i class="fa fa-remove"></i> 删除
-		        </a>
-	        </div>
+        <div class="btn-group-sm" id="toolbar" role="group">
+            <a class="btn btn-success" onclick="$.operate.addFull()" shiro:hasPermission="system:notice:add">
+                <i class="fa fa-plus"></i> 新增
+            </a>
+            <a class="btn btn-primary single disabled" onclick="$.operate.editFull()"
+               shiro:hasPermission="system:notice:edit">
+                <i class="fa fa-edit"></i> 修改
+            </a>
+            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()"
+               shiro:hasPermission="system:notice:remove">
+                <i class="fa fa-remove"></i> 删除
+            </a>
+        </div>
 
-	        <div class="col-sm-12 select-table table-striped">
-	            <table id="bootstrap-table"></table>
-	        </div>
-    	</div>
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
+        </div>
     </div>
 </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('system:notice:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('system:notice:remove')}]];
-        var types = [[${@dict.getType('sys_notice_type')}]];
-        var datas = [[${@dict.getType('sys_notice_status')}]];
-        var prefix = ctx + "system/notice";
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var editFlag = [[${@permission.hasPermi('system:notice:edit')}]];
+    var removeFlag = [[${@permission.hasPermi('system:notice:remove')}]];
+    var types = [[${@dict.getType('sys_notice_type')}]];
+    var datas = [[${@dict.getType('sys_notice_status')}]];
+    var prefix = ctx + "system/notice";
+
+    var loginusername = [[${session.loginusername}]]
 
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-                createUrl: prefix + "/add",
-                updateUrl: prefix + "/edit/{id}",
-                removeUrl: prefix + "/remove",
-                modalName: "公告",
-                columns: [{
-		            checkbox: true
-		        },
-				{
-					field : 'noticeId',
-					title : '序号'
-				},
-				{
-					field : 'noticeTitle',
-					title : '公告标题'
-				},
-				{
-		            field: 'noticeType',
-		            title: '公告类型',
-		            align: 'center',
-		            formatter: function(value, row, index) {
-		            	return $.table.selectDictLabel(types, value);
-		            }
-		        },
-				{
-		            field: 'status',
-		            title: '状态',
-		            align: 'center',
-		            formatter: function(value, row, index) {
-		            	return $.table.selectDictLabel(datas, value);
-		            }
-		        },
-				{
-					field : 'createBy',
-					title : '创建者'
-				},
-				{
-		            field: 'createTime',
-		            title: '创建时间',
-		            sortable: true
-		        },
-		        {
-		            title: '操作',
-		            align: 'center',
-		            formatter: function(value, row, index) {
-		            	var actions = [];
-		            	actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editFull(\'' + row.noticeId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.noticeId + '\')"><i class="fa fa-remove"></i>删除</a>');
-						return actions.join('');
-		            }
-		        }]
-            };
-            $.table.init(options);
-        });
-    </script>
+    $(function () {
+        var options = {
+            url: prefix + "/list",
+            createUrl: prefix + "/add",
+            updateUrl: prefix + "/edit/{id}",
+            removeUrl: prefix + "/remove",
+            modalName: "公告",
+            columns: [{
+                checkbox: true
+            },
+                {
+                    field: 'noticeId',
+                    title: '序号'
+                },
+                {
+                    field: 'noticeTitle',
+                    title: '公告标题'
+                },
+                {
+                    field: 'noticeType',
+                    title: '公告类型',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDictLabel(types, value);
+                    }
+                },
+                {
+                    field: 'status',
+                    title: '状态',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDictLabel(datas, value);
+                    }
+                },
+                {
+                    field: 'createBy',
+                    title: '创建者'
+                },
+                {
+                    field: 'createTime',
+                    title: '创建时间',
+                    sortable: true
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        var actions = [];
+                        if (loginusername == row.createBy) {
+                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editFull(\'' + row.noticeId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                            actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.noticeId + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        }
+                        return actions.join('');
+                    }
+                }]
+        };
+        $.table.init(options);
+    });
+</script>
 </body>
 </html>

+ 6 - 2
mybusiness/src/main/java/com/business/slfh/app/event/service/impl/AppEventServiceImpl.java

@@ -122,8 +122,14 @@ public class AppEventServiceImpl extends AppBaseService implements AppEventServi
         return list;
     }
 
+
+
     @Override
     public AppDataModel queryEventDetail(TUEventFire tuEventFire) {
+
+
+        String dahua_picture_url =iSysConfigService.selectConfigByKey("dahua_picture_url");
+        String basepath = iSysConfigService.selectConfigByKey("http_basepath");
         AppDataModel appDataModel = getAppDataModel();
         try {
             List ls = appEventMapper.queryEventDetail(tuEventFire);
@@ -137,8 +143,6 @@ public class AppEventServiceImpl extends AppBaseService implements AppEventServi
             vo.setAttachs(new ArrayList());
             for (int i = 0; i < attalist.size(); i++) {
                 TResAttach t = attalist.get(i);
-//                String basepath = iSysConfigService.selectConfigByKey("http_basepath");
-                String basepath = "http://122.141.177.142/alarm/";
                 t.setResUrl(basepath + t.getResUrl());
                 vo.getAttachs().add(t);
             }

+ 11 - 8
mybusiness/src/main/java/com/business/slfh/manager/policiesmanager/service/impl/TResPoliciesServiceImpl.java

@@ -5,6 +5,7 @@ import com.business.slfh.manager.policiesmanager.mapper.TResPoliciesMapper;
 import com.business.slfh.manager.policiesmanager.service.ITResPoliciesService;
 import com.sooka.common.core.text.Convert;
 import com.sooka.common.utils.DateUtils;
+import com.sooka.framework.util.ShiroUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -12,19 +13,19 @@ import java.util.List;
 
 /**
  * 【请填写功能名称】Service业务层处理
- * 
+ *
  * @author lei
  * @date 2020-11-27
  */
 @Service
-public class TResPoliciesServiceImpl implements ITResPoliciesService 
+public class TResPoliciesServiceImpl implements ITResPoliciesService
 {
     @Resource
     private TResPoliciesMapper tResPoliciesMapper;
 
     /**
      * 查询【请填写功能名称】
-     * 
+     *
      * @param id 【请填写功能名称】ID
      * @return 【请填写功能名称】
      */
@@ -36,7 +37,7 @@ public class TResPoliciesServiceImpl implements ITResPoliciesService
 
     /**
      * 查询【请填写功能名称】列表
-     * 
+     *
      * @param tResPolicies 【请填写功能名称】
      * @return 【请填写功能名称】
      */
@@ -48,7 +49,7 @@ public class TResPoliciesServiceImpl implements ITResPoliciesService
 
     /**
      * 新增【请填写功能名称】
-     * 
+     *
      * @param tResPolicies 【请填写功能名称】
      * @return 结果
      */
@@ -56,12 +57,14 @@ public class TResPoliciesServiceImpl implements ITResPoliciesService
     public int insertTResPolicies(TResPolicies tResPolicies)
     {
         tResPolicies.setCreateTime(DateUtils.getNowDate());
+        String username = ShiroUtils.getSysUser().getLoginName();
+        tResPolicies.setCreateBy(username);
         return tResPoliciesMapper.insertTResPolicies(tResPolicies);
     }
 
     /**
      * 修改【请填写功能名称】
-     * 
+     *
      * @param tResPolicies 【请填写功能名称】
      * @return 结果
      */
@@ -74,7 +77,7 @@ public class TResPoliciesServiceImpl implements ITResPoliciesService
 
     /**
      * 删除【请填写功能名称】对象
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */
@@ -86,7 +89,7 @@ public class TResPoliciesServiceImpl implements ITResPoliciesService
 
     /**
      * 删除【请填写功能名称】信息
-     * 
+     *
      * @param id 【请填写功能名称】ID
      * @return 结果
      */

+ 32 - 28
mybusiness/src/main/java/com/business/slfh/manager/reserveplanmanager/service/impl/TBusReserveplanServiceImpl.java

@@ -9,6 +9,7 @@ import com.business.slfh.manager.reserveplanmanager.mapper.TBusReserveplanMapper
 import com.business.slfh.tools.UUID_Tools;
 import com.sooka.common.core.text.Convert;
 import com.sooka.common.utils.DateUtils;
+import com.sooka.framework.util.ShiroUtils;
 import org.springframework.stereotype.Service;
 import com.business.slfh.manager.reserveplanmanager.service.ITBusReserveplanService;
 
@@ -16,12 +17,12 @@ import javax.annotation.Resource;
 
 /**
  * 【请填写功能名称】Service业务层处理
- * 
+ *
  * @author lei
  * @date 2020-11-26
  */
 @Service
-public class TBusReserveplanServiceImpl implements ITBusReserveplanService 
+public class TBusReserveplanServiceImpl implements ITBusReserveplanService
 {
     @Resource
     private TBusReserveplanMapper tBusReserveplanMapper;
@@ -30,7 +31,7 @@ public class TBusReserveplanServiceImpl implements ITBusReserveplanService
 
     /**
      * 查询【请填写功能名称】
-     * 
+     *
      * @param id 【请填写功能名称】ID
      * @return 【请填写功能名称】
      */
@@ -54,7 +55,7 @@ public class TBusReserveplanServiceImpl implements ITBusReserveplanService
 
     /**
      * 查询【请填写功能名称】列表
-     * 
+     *
      * @param tBusReserveplan 【请填写功能名称】
      * @return 【请填写功能名称】
      */
@@ -80,7 +81,7 @@ public class TBusReserveplanServiceImpl implements ITBusReserveplanService
 
     /**
      * 新增【请填写功能名称】
-     * 
+     *
      * @param tBusReserveplan 【请填写功能名称】
      * @return 结果
      */
@@ -88,20 +89,22 @@ public class TBusReserveplanServiceImpl implements ITBusReserveplanService
     public int insertTBusReserveplan(TBusReserveplan tBusReserveplan)
     {
         tBusReserveplan.setCreateTime(DateUtils.getNowDate());
-        String[] fileNames = tBusReserveplan.getPics().split(",");
-        TResAttach tResAttach = new TResAttach();
-        tResAttach.setBusId(tBusReserveplan.getId());
-        for (int i = 0; i < fileNames.length; i++) {
-            tResAttach.setId(UUID_Tools.getUUID());
-            tResAttach.setResUrl(fileNames[i]);
-            tResAttachMapper.insertTResAttach(tResAttach);
-        }
+        String username = ShiroUtils.getSysUser().getLoginName();
+        tBusReserveplan.setCreateBy(username);
+//        String[] fileNames = tBusReserveplan.getPics().split(",");
+//        TResAttach tResAttach = new TResAttach();
+//        tResAttach.setBusId(tBusReserveplan.getId());
+//        for (int i = 0; i < fileNames.length; i++) {
+//            tResAttach.setId(UUID_Tools.getUUID());
+//            tResAttach.setResUrl(fileNames[i]);
+//            tResAttachMapper.insertTResAttach(tResAttach);
+//        }
         return tBusReserveplanMapper.insertTBusReserveplan(tBusReserveplan);
     }
 
     /**
      * 修改【请填写功能名称】
-     * 
+     *
      * @param tBusReserveplan 【请填写功能名称】
      * @return 结果
      */
@@ -109,24 +112,25 @@ public class TBusReserveplanServiceImpl implements ITBusReserveplanService
     public int updateTBusReserveplan(TBusReserveplan tBusReserveplan)
     {
         tBusReserveplan.setUpdateTime(DateUtils.getNowDate());
-        String[] fileNames = tBusReserveplan.getPics().split(",");
-        TResAttach tResAttach = new TResAttach();
-        tResAttach.setBusId(tBusReserveplan.getId());
-        List<TResAttach> tResAttachList = tResAttachMapper.selectTResAttachList(tResAttach);
-        for (int i = 0; i < tResAttachList.size(); i++) {
-            tResAttachMapper.deleteTResAttachById(tResAttachList.get(i).getId());
-        }
-        for (int i = 0; i < fileNames.length; i++) {
-            tResAttach.setId(UUID_Tools.getUUID());
-            tResAttach.setResUrl(fileNames[i]);
-            tResAttachMapper.insertTResAttach(tResAttach);
-        }
+
+//        String[] fileNames = tBusReserveplan.getPics().split(",");
+//        TResAttach tResAttach = new TResAttach();
+//        tResAttach.setBusId(tBusReserveplan.getId());
+//        List<TResAttach> tResAttachList = tResAttachMapper.selectTResAttachList(tResAttach);
+//        for (int i = 0; i < tResAttachList.size(); i++) {
+//            tResAttachMapper.deleteTResAttachById(tResAttachList.get(i).getId());
+//        }
+//        for (int i = 0; i < fileNames.length; i++) {
+//            tResAttach.setId(UUID_Tools.getUUID());
+//            tResAttach.setResUrl(fileNames[i]);
+//            tResAttachMapper.insertTResAttach(tResAttach);
+//        }
         return tBusReserveplanMapper.updateTBusReserveplan(tBusReserveplan);
     }
 
     /**
      * 删除【请填写功能名称】对象
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */
@@ -138,7 +142,7 @@ public class TBusReserveplanServiceImpl implements ITBusReserveplanService
 
     /**
      * 删除【请填写功能名称】信息
-     * 
+     *
      * @param id 【请填写功能名称】ID
      * @return 结果
      */

+ 5 - 0
mybusiness/src/main/java/com/business/slfh/visualization/event/controller/Visualization_Event_Controller.java

@@ -179,8 +179,13 @@ public class Visualization_Event_Controller extends AppBaseController {
         return prefix + "/map";
     }
 
+
+
     @RequestMapping("/getVisualizationDetails")
     public String getVisualizationDetails(ModelMap map, HttpServletRequest request) {
+
+        String dahua_picture_url =iSysConfigService.selectConfigByKey("dahua_picture_url");
+
         String eventId = request.getParameter("eventId");
         String reservePlanType = request.getParameter("reservePlanType");
         visualization_event_service.updateEventSign(eventId,reservePlanType);

+ 11 - 9
mybusiness/src/main/resources/templates/business/manager/policiesmanager/index.html

@@ -104,9 +104,9 @@
     var editFlag = [[${@permission.hasPermi('system:policies:edit')}]];
     var removeFlag = [[${@permission.hasPermi('system:policies:remove')}]];
     var prefix = ctx + "business/manager/policiesmanager";
-
+    var loginusername = [[${session.loginusername}]]
     $(function () {
-        console.log("p url==",prefix + "/list")
+        console.log("p url==", prefix + "/list")
 
         var options = {
             url: prefix + "/list",
@@ -150,8 +150,8 @@
                 {
                     field: 'introduction',
                     title: '简介',
-                    formatter: function(value, row, index) {
-                        return value.length>10?value.substring(0,10)+'...':value;
+                    formatter: function (value, row, index) {
+                        return value.length > 10 ? value.substring(0, 10) + '...' : value;
                     }
                 },
                 {
@@ -165,7 +165,7 @@
                 {
                     field: 'makeDate',
                     title: '发文时间', formatter: function (value, row, index) {
-                        if(value != null){
+                        if (value != null) {
                             var now = new Date(value);
                             var year = now.getFullYear(); //得到年份
                             var month = now.getMonth();//得到月份
@@ -177,7 +177,7 @@
                             time = year + "-" + month + "-" + date;
                             return time;
                         }
-                        return  value;
+                        return value;
                     }
 
                 },
@@ -191,8 +191,10 @@
                     formatter: function (value, row, index) {
                         var actions = [];
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="showDetail(\'' + row.id + '\')"><i class="fa fa-edit"></i>详情</a> ');
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        if (loginusername == row.createBy) {
+                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                            actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        }
                         return actions.join('');
                     }
                 }]
@@ -201,7 +203,7 @@
     });
 
     function showDetail(id) {
-        var url = prefix + "/detail/"+id;
+        var url = prefix + "/detail/" + id;
         $.modal.open("查看【政策法规】详情", url);
     }
 </script>

+ 20 - 20
mybusiness/src/main/resources/templates/business/manager/reserveplanmanager/add.html

@@ -25,19 +25,19 @@
                     <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">${comment}:</label>
                 <div class="col-sm-8">
                     <input name="delFlag" class="form-control" type="text">
                 </div>
             </div>-->
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">预案题目:</label>
                 <div class="col-sm-8">
                     <input maxlength="100" name="title" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">预案类型:</label>
                 <div class="col-sm-8">
                     <select name="type" class="form-control m-b" th:with="type=${@dict.getType('reserveplan_type')}">
@@ -50,7 +50,7 @@
                     <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>-->
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">预案等级:</label>
                 <div class="col-sm-8">
                     <!--<input name="level" class="form-control" type="text">-->
@@ -66,21 +66,21 @@
                     <textarea id="content" name="content" class="form-control"></textarea>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="label_wid control-label">请选择文件:</label>
-                <div class="col-sm-5">
-                    <table>
-                        <input name="pics" id="pics" type="hidden">
-                        <tr>
-                            <td id="picBox">
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><input type="file" onchange="submitUpload(this)"></td>
-                        </tr>
-                    </table>
-                </div>
-            </div>
+            <!--<div class="form-group">-->
+                <!--<label class="label_wid control-label">请选择文件:</label>-->
+                <!--<div class="col-sm-5">-->
+                    <!--<table>-->
+                        <!--<input name="pics" id="pics" type="hidden">-->
+                        <!--<tr>-->
+                            <!--<td id="picBox">-->
+                            <!--</td>-->
+                        <!--</tr>-->
+                        <!--<tr>-->
+                            <!--<td><input type="file" onchange="submitUpload(this)"></td>-->
+                        <!--</tr>-->
+                    <!--</table>-->
+                <!--</div>-->
+            <!--</div>-->
         </form>
     </div>
     <th:block th:include="include :: footer" />
@@ -148,4 +148,4 @@
         }
     </script>
 </body>
-</html>
+</html>

+ 20 - 20
mybusiness/src/main/resources/templates/business/manager/reserveplanmanager/edit.html

@@ -26,13 +26,13 @@
                     <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
                 </div>
             </div>-->
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">预案题目:</label>
                 <div class="col-sm-8">
                     <input maxlength="100" name="title" th:field="*{title}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">预案类型:</label>
                 <div class="col-sm-8">
                     <select name="type" class="form-control m-b" th:with="type=${@dict.getType('reserveplan_type')}">
@@ -45,7 +45,7 @@
                     <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>-->
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">预案等级:</label>
                 <div class="col-sm-8">
                     <select name="level" class="form-control m-b" th:with="type=${@dict.getType('reserveplan_level')}">
@@ -55,27 +55,27 @@
                     <!--<input name="level" th:field="*{level}" class="form-control" type="text">-->
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">预案正文资源:</label>
                 <div class="col-sm-8">
                     <input name="content" th:field="*{content}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">
-                <label class="label_wid control-label">请选择文件:</label>
-                <div class="col-sm-5">
-                    <table>
-                        <input name="pics" id="pics" type="hidden" th:field="*{pics}">
-                        <tr>
-                            <td id="picBox">
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><input type="file" onchange="submitUpload(this)"></td>
-                        </tr>
-                    </table>
-                </div>
-            </div>
+            <!--<div class="form-group">-->
+                <!--<label class="label_wid control-label">请选择文件:</label>-->
+                <!--<div class="col-sm-5">-->
+                    <!--<table>-->
+                        <!--<input name="pics" id="pics" type="hidden" th:field="*{pics}">-->
+                        <!--<tr>-->
+                            <!--<td id="picBox">-->
+                            <!--</td>-->
+                        <!--</tr>-->
+                        <!--<tr>-->
+                            <!--<td><input type="file" onchange="submitUpload(this)"></td>-->
+                        <!--</tr>-->
+                    <!--</table>-->
+                <!--</div>-->
+            <!--</div>-->
         </form>
     </div>
     <th:block th:include="include :: footer" />
@@ -166,4 +166,4 @@
         });
     </script>
 </body>
-</html>
+</html>

+ 12 - 4
mybusiness/src/main/resources/templates/business/manager/reserveplanmanager/index.html

@@ -4,6 +4,8 @@
     <th:block th:include="include :: header('【预案信息】列表')" />
 </head>
 <body class="gray-bg">
+
+
      <div class="container-div">
         <div class="row">
             <div class="col-sm-12 search-collapse">
@@ -82,6 +84,9 @@
         var removeFlag = [[${@permission.hasPermi('system:reserveplan:remove')}]];
         var prefix = ctx + "business/manager/reserveplanmanager";
 
+        var loginusername = [[${session.loginusername}]]
+
+
         $(function() {
             var options = {
                 url: prefix + "/list",
@@ -133,9 +138,12 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
-                        return actions.join('');
+                        if(loginusername == row.createBy){
+                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                            actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+
+                        }
+                       return actions.join('');
                     }
                 }]
             };
@@ -143,4 +151,4 @@
         });
     </script>
 </body>
-</html>
+</html>