Administrator 2 lat temu
rodzic
commit
a8e55dbf77

+ 139 - 305
.idea/workspace.xml

@@ -3,13 +3,10 @@
   <component name="ChangeListManager">
   <component name="ChangeListManager">
     <list default="true" id="8ad4baec-f819-4a7c-b135-6a76a7a0c72f" name="Default" comment="">
     <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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/service/impl/DaHuaMessageServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/service/impl/DaHuaMessageServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/service/impl/Visualization_Event_Service_Impl.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/service/impl/Visualization_Event_Service_Impl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/mapper/grid/visualization/Visualization_Event_Mapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/mapper/grid/visualization/Visualization_Event_Mapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/cameramanager/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/cameramanager/add.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/cameramanager/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/cameramanager/edit.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/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/waterintake/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/waterintake/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/leiSP-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/leiSP-admin/src/main/resources/application.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/levelmanager/domain/TResLevel.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/levelmanager/domain/TResLevel.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/levelmanager/service/impl/TResLevelServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/levelmanager/service/impl/TResLevelServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/mapper/grid/manager/TResLevelMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/mapper/grid/manager/TResLevelMapper.xml" afterDir="false" />
     </list>
     </list>
     <ignored path="$PROJECT_DIR$/leiSP-admin/target/" />
     <ignored path="$PROJECT_DIR$/leiSP-admin/target/" />
     <ignored path="$PROJECT_DIR$/target/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -27,53 +24,7 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   </component>
   <component name="FileEditorManager">
   <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/policiesmanager/index.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="240">
-              <caret line="110" column="23" lean-forward="true" selection-start-line="110" selection-start-column="23" selection-end-line="110" selection-end-column="23" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="TResWaterintakeController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/waterintake/controller/TResWaterintakeController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="381">
-              <caret line="49" column="17" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="17" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="TResPoliciesController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/policiesmanager/controller/TResPoliciesController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="240">
-              <caret line="28" column="63" lean-forward="true" selection-start-line="28" selection-start-column="4" selection-end-line="28" selection-end-column="63" />
-            </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/camera/index.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-2036">
-              <caret line="15" column="39" selection-start-line="15" selection-start-column="39" selection-end-line="15" selection-end-column="39" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="index.html" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/waterintake/index.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="164">
-              <caret line="62" column="24" selection-start-line="62" selection-start-column="24" selection-end-line="62" selection-end-column="24" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
   </component>
   </component>
   <component name="FileTemplateManagerImpl">
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
     <option name="RECENT_TEMPLATES">
@@ -85,10 +36,6 @@
   </component>
   </component>
   <component name="FindInProjectRecents">
   <component name="FindInProjectRecents">
     <findStrings>
     <findStrings>
-      <find>saveFire</find>
-      <find>getTResCameraByCameraCode</find>
-      <find>selectTResCameraByCameraId</find>
-      <find>selectTResCameraVo</find>
       <find>openDetailsDia</find>
       <find>openDetailsDia</find>
       <find>getVisualizationDetails</find>
       <find>getVisualizationDetails</find>
       <find>selectTResCameraByCameraId$</find>
       <find>selectTResCameraByCameraId$</find>
@@ -115,6 +62,10 @@
       <find>水渠</find>
       <find>水渠</find>
       <find>取水</find>
       <find>取水</find>
       <find>水鹤</find>
       <find>水鹤</find>
+      <find>selectTResLevelList</find>
+      <find>filterTResLevel</find>
+      <find>addFilter</find>
+      <find>recttime</find>
     </findStrings>
     </findStrings>
     <dirStrings>
     <dirStrings>
       <dir>E:\首佳工作目录\辉南-集安\code\hnly\mybusiness\src\main\java\com\business\slfh\manager\cameramanager</dir>
       <dir>E:\首佳工作目录\辉南-集安\code\hnly\mybusiness\src\main\java\com\business\slfh\manager\cameramanager</dir>
@@ -138,7 +89,6 @@
     <option name="CHANGED_PATHS">
     <option name="CHANGED_PATHS">
       <list>
       <list>
         <option value="$PROJECT_DIR$/leiSP-admin/src/main/resources/application-druid.yml" />
         <option value="$PROJECT_DIR$/leiSP-admin/src/main/resources/application-druid.yml" />
-        <option value="$PROJECT_DIR$/leiSP-admin/src/main/resources/application.yml" />
         <option value="$PROJECT_DIR$/leiSP-admin/pom.xml" />
         <option value="$PROJECT_DIR$/leiSP-admin/pom.xml" />
         <option value="$PROJECT_DIR$/leiSP-common/pom.xml" />
         <option value="$PROJECT_DIR$/leiSP-common/pom.xml" />
         <option value="$PROJECT_DIR$/leiSP-generator/pom.xml" />
         <option value="$PROJECT_DIR$/leiSP-generator/pom.xml" />
@@ -181,6 +131,11 @@
         <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/service/impl/DaHuaMessageServiceImpl.java" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/service/impl/DaHuaMessageServiceImpl.java" />
         <option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/policiesmanager/index.html" />
         <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$/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" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/levelmanager/service/impl/TResLevelServiceImpl.java" />
+        <option value="$PROJECT_DIR$/leiSP-admin/src/main/resources/application.yml" />
+        <option value="$PROJECT_DIR$/mybusiness/src/main/resources/mapper/grid/manager/TResLevelMapper.xml" />
       </list>
       </list>
     </option>
     </option>
   </component>
   </component>
@@ -220,10 +175,10 @@
     </packageJsonPaths>
     </packageJsonPaths>
   </component>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="1869" />
-    <option name="y" value="12" />
-    <option name="width" value="1920" />
-    <option name="height" value="1040" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1936" />
+    <option name="height" value="1056" />
   </component>
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
   <component name="ProjectView">
@@ -247,171 +202,56 @@
             <path>
             <path>
               <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
               <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
               <item name="hnly" type="462c0819:PsiDirectoryNode" />
               <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" />
-              <item name="hnly" type="462c0819:PsiDirectoryNode" />
-              <item name="mybusiness" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="leiSP-admin" type="462c0819:PsiDirectoryNode" />
             </path>
             </path>
             <path>
             <path>
               <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
               <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
               <item name="hnly" type="462c0819:PsiDirectoryNode" />
               <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="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="business" type="462c0819:PsiDirectoryNode" />
             </path>
             </path>
             <path>
             <path>
               <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
               <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
               <item name="hnly" type="462c0819:PsiDirectoryNode" />
               <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="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="business" type="462c0819:PsiDirectoryNode" />
-              <item name="slfh" type="462c0819:PsiDirectoryNode" />
             </path>
             </path>
             <path>
             <path>
               <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
               <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
               <item name="hnly" type="462c0819:PsiDirectoryNode" />
               <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="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" 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" />
             </path>
             </path>
             <path>
             <path>
               <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
               <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
               <item name="hnly" type="462c0819:PsiDirectoryNode" />
               <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="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" 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="com" type="462c0819:PsiDirectoryNode" />
             </path>
             </path>
             <path>
             <path>
               <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
               <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
               <item name="hnly" type="462c0819:PsiDirectoryNode" />
               <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="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" 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="controller" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="web" type="462c0819:PsiDirectoryNode" />
             </path>
             </path>
             <path>
             <path>
               <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
               <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
               <item name="hnly" type="462c0819:PsiDirectoryNode" />
               <item name="hnly" type="462c0819:PsiDirectoryNode" />
-              <item name="mybusiness" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="business" type="462c0819:PsiDirectoryNode" />
-              <item name="slfh" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-              <item name="waterintake" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
-              <item name="hnly" type="462c0819:PsiDirectoryNode" />
-              <item name="mybusiness" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="business" type="462c0819:PsiDirectoryNode" />
-              <item name="slfh" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-              <item name="waterintake" type="462c0819:PsiDirectoryNode" />
-              <item name="controller" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
-              <item name="hnly" type="462c0819:PsiDirectoryNode" />
-              <item name="mybusiness" type="462c0819:PsiDirectoryNode" />
+              <item name="leiSP-admin" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="resources" type="462c0819:PsiDirectoryNode" />
               <item name="resources" type="462c0819:PsiDirectoryNode" />
             </path>
             </path>
-            <path>
-              <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
-              <item name="hnly" type="462c0819:PsiDirectoryNode" />
-              <item name="mybusiness" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="resources" type="462c0819:PsiDirectoryNode" />
-              <item name="templates" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
-              <item name="hnly" type="462c0819:PsiDirectoryNode" />
-              <item name="mybusiness" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="resources" type="462c0819:PsiDirectoryNode" />
-              <item name="templates" type="462c0819:PsiDirectoryNode" />
-              <item name="business" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
-              <item name="hnly" type="462c0819:PsiDirectoryNode" />
-              <item name="mybusiness" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="resources" type="462c0819:PsiDirectoryNode" />
-              <item name="templates" type="462c0819:PsiDirectoryNode" />
-              <item name="business" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
-              <item name="hnly" type="462c0819:PsiDirectoryNode" />
-              <item name="mybusiness" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="resources" type="462c0819:PsiDirectoryNode" />
-              <item name="templates" type="462c0819:PsiDirectoryNode" />
-              <item name="business" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-              <item name="policiesmanager" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
-              <item name="hnly" type="462c0819:PsiDirectoryNode" />
-              <item name="mybusiness" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="resources" type="462c0819:PsiDirectoryNode" />
-              <item name="templates" type="462c0819:PsiDirectoryNode" />
-              <item name="business" type="462c0819:PsiDirectoryNode" />
-              <item name="manager" type="462c0819:PsiDirectoryNode" />
-              <item name="waterintake" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           </expand>
           <select />
           <select />
         </subPane>
         </subPane>
@@ -428,7 +268,7 @@
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
     <property name="aspect.path.notification.shown" value="true" />
     <property name="dynamic.classpath" value="true" />
     <property name="dynamic.classpath" value="true" />
-    <property name="last_opened_file_path" value="F:/首佳科技/森林防火项目/开发/senlinfanghuo_java" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../../数字集安/code/jian" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="project.structure.last.edited" value="Project" />
     <property name="project.structure.last.edited" value="Project" />
@@ -458,6 +298,8 @@
           <option name="mySupportsDeletion" value="false" />
           <option name="mySupportsDeletion" value="false" />
           <option name="myCanBeAbsent" value="false" />
           <option name="myCanBeAbsent" value="false" />
           <option name="myId" value="UPDATED" />
           <option name="myId" value="UPDATED" />
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/index.html</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/visualization/event.html</PATH>
         </FILE-GROUP>
         </FILE-GROUP>
         <FILE-GROUP>
         <FILE-GROUP>
           <option name="myUpdateName" value="Created" />
           <option name="myUpdateName" value="Created" />
@@ -465,15 +307,6 @@
           <option name="mySupportsDeletion" value="false" />
           <option name="mySupportsDeletion" value="false" />
           <option name="myCanBeAbsent" value="false" />
           <option name="myCanBeAbsent" value="false" />
           <option name="myId" value="CREATED" />
           <option name="myId" value="CREATED" />
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/waterintake/controller/TResWaterintakeController.java</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/waterintake/domain/TResWaterintake.java</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/waterintake/mapper/TResWaterintakeMapper.java</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/waterintake/service/ITResWaterintakeService.java</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/waterintake/service/impl/TResWaterintakeServiceImpl.java</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/mybusiness/src/main/resources/mapper/grid/manager/TResWaterintakeMapper.xml</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/waterintake/add.html</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/waterintake/edit.html</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/waterintake/index.html</PATH>
         </FILE-GROUP>
         </FILE-GROUP>
         <FILE-GROUP>
         <FILE-GROUP>
           <option name="myUpdateName" value="Deleted" />
           <option name="myUpdateName" value="Deleted" />
@@ -668,7 +501,7 @@
       <workItem from="1665447580649" duration="15844000" />
       <workItem from="1665447580649" duration="15844000" />
       <workItem from="1665533158898" duration="23200000" />
       <workItem from="1665533158898" duration="23200000" />
       <workItem from="1665628201922" duration="10691000" />
       <workItem from="1665628201922" duration="10691000" />
-      <workItem from="1665709592040" duration="7355000" />
+      <workItem from="1665709592040" duration="14992000" />
     </task>
     </task>
     <task id="LOCAL-00001" summary="http">
     <task id="LOCAL-00001" summary="http">
       <created>1665216030960</created>
       <created>1665216030960</created>
@@ -796,15 +629,21 @@
       <option name="project" value="LOCAL" />
       <option name="project" value="LOCAL" />
       <updated>1665629270144</updated>
       <updated>1665629270144</updated>
     </task>
     </task>
-    <option name="localTasksCounter" value="19" />
+    <task id="LOCAL-00019" summary="http">
+      <created>1665720390593</created>
+      <option name="number" value="00019" />
+      <option name="presentableId" value="LOCAL-00019" />
+      <option name="project" value="LOCAL" />
+      <updated>1665720390593</updated>
+    </task>
+    <option name="localTasksCounter" value="20" />
     <servers />
     <servers />
   </component>
   </component>
   <component name="TimeTrackingManager">
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="104394000" />
+    <option name="totallyTimeSpent" value="112031000" />
   </component>
   </component>
   <component name="ToolWindowManager">
   <component name="ToolWindowManager">
-    <frame x="1912" y="-8" width="1936" height="1096" extended-state="6" />
-    <editor active="true" />
+    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
     <layout>
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
@@ -816,7 +655,7 @@
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <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 anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info id="UI Designer" order="2" />
       <window_info id="UI Designer" order="2" />
-      <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.29787233" />
+      <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.35777777" />
       <window_info anchor="bottom" id="TODO" order="6" />
       <window_info anchor="bottom" id="TODO" order="6" />
       <window_info anchor="bottom" id="Messages" order="7" weight="0.4211111" />
       <window_info anchor="bottom" id="Messages" order="7" weight="0.4211111" />
       <window_info anchor="right" id="Palette&#9;" order="3" />
       <window_info anchor="right" id="Palette&#9;" order="3" />
@@ -826,7 +665,7 @@
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.3617021" />
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.3617021" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.52666664" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.52666664" />
       <window_info anchor="bottom" id="Spring" order="7" />
       <window_info anchor="bottom" id="Spring" order="7" />
-      <window_info anchor="bottom" id="Terminal" order="7" weight="0.40222222" />
+      <window_info anchor="bottom" id="Terminal" order="7" weight="0.42333335" />
       <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.22014925" />
       <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.22014925" />
       <window_info anchor="right" id="Bean Validation" order="3" />
       <window_info anchor="right" id="Bean Validation" order="3" />
       <window_info id="Web" order="2" side_tool="true" />
       <window_info id="Web" order="2" side_tool="true" />
@@ -860,89 +699,16 @@
           <option name="timeStamp" value="24" />
           <option name="timeStamp" value="24" />
         </line-breakpoint>
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/service/impl/DaHuaMessageServiceImpl.java</url>
-          <line>306</line>
+          <url>file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/levelmanager/service/impl/TResLevelServiceImpl.java</url>
+          <line>77</line>
           <properties />
           <properties />
-          <option name="timeStamp" value="28" />
+          <option name="timeStamp" value="36" />
         </line-breakpoint>
         </line-breakpoint>
       </breakpoints>
       </breakpoints>
-      <option name="time" value="29" />
+      <option name="time" value="37" />
     </breakpoint-manager>
     </breakpoint-manager>
   </component>
   </component>
   <component name="editorHistoryManager">
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/demo.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="227">
-          <caret line="136" column="13" lean-forward="true" selection-start-line="136" selection-start-column="13" selection-end-line="136" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/lib/on_off_switch.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="47">
-          <caret line="67" column="23" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/tools/JiGuangPushUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="390">
-          <caret line="28" column="11" selection-start-line="28" selection-start-column="11" selection-end-line="28" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-      <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/leiSP-admin/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1950">
-          <caret line="5" column="25" selection-start-line="5" selection-start-column="20" selection-end-line="5" selection-end-column="25" />
-        </state>
-      </provider>
-      <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/carmanager/domain/TResCar.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="211">
-          <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/cameramanager/domain/TResCamera.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="511">
-          <caret line="88" column="29" selection-start-line="88" selection-start-column="29" selection-end-line="88" selection-end-column="29" />
-          <folding>
-            <element signature="e#2031#2032#0" expanded="true" />
-            <element signature="e#2070#2071#0" expanded="true" />
-            <element signature="e#2100#2101#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/cameramanager/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="390">
-          <caret line="112" column="30" selection-start-line="112" selection-start-column="30" selection-end-line="112" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/cameramanager/service/ITResCameraService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="177">
-          <caret line="44" selection-start-line="44" selection-end-line="44" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/cameramanager/controller/TResCameraController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="321">
-          <caret line="168" selection-start-line="168" selection-end-line="168" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/cameramanager/service/impl/TResCameraServiceImpl.java">
     <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/cameramanager/service/impl/TResCameraServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="350">
         <state relative-caret-position="350">
@@ -957,13 +723,6 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/bin/package.bat">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="9" column="5" selection-start-line="9" selection-start-column="5" selection-end-line="9" selection-end-column="45" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/cameramanager/add.html">
     <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/cameramanager/add.html">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="270">
         <state relative-caret-position="270">
@@ -1042,13 +801,6 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/service/impl/DaHuaMessageServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="307">
-          <caret line="426" lean-forward="true" selection-start-line="426" selection-end-line="426" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/stationlandmanager/controller/TResStationlandController.java">
     <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/stationlandmanager/controller/TResStationlandController.java">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="450">
         <state relative-caret-position="450">
@@ -1151,31 +903,113 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/policiesmanager/index.html">
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/waterintake/controller/TResWaterintakeController.java">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="110" column="23" lean-forward="true" selection-start-line="110" selection-start-column="23" selection-end-line="110" selection-end-column="23" />
+        <state relative-caret-position="381">
+          <caret line="49" column="17" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="17" />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/waterintake/controller/TResWaterintakeController.java">
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/policiesmanager/index.html">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="381">
-          <caret line="49" column="17" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="17" />
+        <state relative-caret-position="120">
+          <caret line="106" lean-forward="true" selection-start-line="106" selection-end-line="106" />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
     <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/camera/index.html">
     <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/camera/index.html">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2036">
+        <state relative-caret-position="-19496">
           <caret line="15" column="39" selection-start-line="15" selection-start-column="39" selection-end-line="15" selection-end-column="39" />
           <caret line="15" column="39" selection-start-line="15" selection-start-column="39" selection-end-line="15" selection-end-column="39" />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
     <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/waterintake/index.html">
     <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/waterintake/index.html">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="62" column="24" selection-start-line="62" selection-start-column="24" selection-end-line="62" selection-end-column="24" />
+        <state relative-caret-position="134">
+          <caret line="61" column="47" lean-forward="true" selection-start-line="61" selection-start-column="47" selection-end-line="61" selection-end-column="47" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/visualization/event.html">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/bin/package.bat">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="9" column="8" selection-start-line="9" selection-start-column="5" selection-end-line="9" selection-end-column="45" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/service/impl/DaHuaMessageServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="427">
+          <caret line="358" column="18" lean-forward="true" selection-start-line="358" selection-start-column="18" selection-end-line="358" selection-end-column="18" />
+        </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="-9976" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/levelmanager/service/ITResLevelService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="173">
+          <caret line="44" column="30" selection-start-line="44" selection-start-column="15" selection-end-line="44" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/main.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="180">
+          <caret line="378" column="44" selection-start-line="378" selection-start-column="44" selection-end-line="378" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/levelmanager/controller/TResLevelController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="105" column="38" selection-start-line="105" selection-start-column="38" selection-end-line="105" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/levelmanager/domain/TResLevel.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="383">
+          <caret line="126" column="37" lean-forward="true" selection-start-line="126" selection-start-column="37" selection-end-line="126" selection-end-column="37" />
+          <folding>
+            <element signature="e#2982#2983#0" expanded="true" />
+            <element signature="e#3016#3017#0" expanded="true" />
+            <element signature="e#3070#3071#0" expanded="true" />
+            <element signature="e#3116#3117#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <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="-962" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/resources/application.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="125">
+          <caret line="56" column="49" selection-start-line="56" selection-start-column="49" selection-end-line="56" selection-end-column="49" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/levelmanager/service/impl/TResLevelServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="98">
+          <caret line="82" selection-start-line="82" selection-end-line="82" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/mapper/grid/manager/TResLevelMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="300">
+          <caret line="46" column="35" lean-forward="true" selection-start-line="46" selection-start-column="35" selection-end-line="46" selection-end-column="35" />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>

+ 1 - 0
leiSP-admin/src/main/resources/application.yml

@@ -54,6 +54,7 @@ logging:
     com.business.slfh.manager.cameramanager.mapper : debug
     com.business.slfh.manager.cameramanager.mapper : debug
     com.business.slfh.app.applyassistance.mapper : debug
     com.business.slfh.app.applyassistance.mapper : debug
     com.business.slfh.manager.firemanager.mapper : debug
     com.business.slfh.manager.firemanager.mapper : debug
+    com.business.slfh.manager.levelmanager.mapper : debug
     org.springframework: warn
     org.springframework: warn
 
 
 # 用户配置
 # 用户配置

+ 28 - 18
mybusiness/src/main/java/com/business/slfh/manager/levelmanager/domain/TResLevel.java

@@ -13,7 +13,7 @@ import java.util.Date;
 
 
 /**
 /**
  * 【请填写功能名称】对象 t_res_level
  * 【请填写功能名称】对象 t_res_level
- * 
+ *
  * @author lei
  * @author lei
  * @date 2020-11-23
  * @date 2020-11-23
  */
  */
@@ -67,75 +67,85 @@ public class TResLevel extends BaseEntity
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String fireRating;
     private String fireRating;
 
 
-    public void setId(String id) 
+    public void setId(String id)
     {
     {
         this.id = id;
         this.id = id;
     }
     }
 
 
-    public String getId() 
+    public String getId()
     {
     {
         return id;
         return id;
     }
     }
-    public void setStatus(String status) 
+    public void setStatus(String status)
     {
     {
         this.status = status;
         this.status = status;
     }
     }
 
 
-    public String getStatus() 
+    public String getStatus()
     {
     {
         return status;
         return status;
     }
     }
-    public void setDelFlag(String delFlag) 
+    public void setDelFlag(String delFlag)
     {
     {
         this.delFlag = delFlag;
         this.delFlag = delFlag;
     }
     }
 
 
-    public String getDelFlag() 
+    public String getDelFlag()
     {
     {
         return delFlag;
         return delFlag;
     }
     }
-    public void setAreaId(String areaId) 
+    public void setAreaId(String areaId)
     {
     {
         this.areaId = areaId;
         this.areaId = areaId;
     }
     }
 
 
-    public String getAreaId() 
+    public String getAreaId()
     {
     {
         return areaId;
         return areaId;
     }
     }
-    public void setRectime(Date rectime) 
+    public void setRectime(Date rectime)
     {
     {
         this.rectime = rectime;
         this.rectime = rectime;
     }
     }
 
 
-    public Date getRectime() 
+    public Date getRectime()
     {
     {
         return rectime;
         return rectime;
     }
     }
-    public void setWeather(String weather) 
+    public void setWeather(String weather)
     {
     {
         this.weather = weather;
         this.weather = weather;
     }
     }
 
 
-    public String getWeather() 
+    public String rectimeStr;
+
+    public String getRectimeStr() {
+        return rectimeStr;
+    }
+
+    public void setRectimeStr(String rectimeStr) {
+        this.rectimeStr = rectimeStr;
+    }
+
+    public String getWeather()
     {
     {
         return weather;
         return weather;
     }
     }
-    public void setWindPower(BigDecimal windPower) 
+    public void setWindPower(BigDecimal windPower)
     {
     {
         this.windPower = windPower;
         this.windPower = windPower;
     }
     }
 
 
-    public BigDecimal getWindPower() 
+    public BigDecimal getWindPower()
     {
     {
         return windPower;
         return windPower;
     }
     }
-    public void setWindDirection(String windDirection) 
+    public void setWindDirection(String windDirection)
     {
     {
         this.windDirection = windDirection;
         this.windDirection = windDirection;
     }
     }
 
 
-    public String getWindDirection() 
+    public String getWindDirection()
     {
     {
         return windDirection;
         return windDirection;
     }
     }
@@ -145,7 +155,7 @@ public class TResLevel extends BaseEntity
         this.humidity = humidity;
         this.humidity = humidity;
     }
     }
 
 
-    public BigDecimal getHumidity() 
+    public BigDecimal getHumidity()
     {
     {
         return humidity;
         return humidity;
     }
     }

+ 15 - 8
mybusiness/src/main/java/com/business/slfh/manager/levelmanager/service/impl/TResLevelServiceImpl.java

@@ -1,5 +1,7 @@
 package com.business.slfh.manager.levelmanager.service.impl;
 package com.business.slfh.manager.levelmanager.service.impl;
 
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 import java.util.List;
 import com.business.slfh.manager.levelmanager.domain.TResLevel;
 import com.business.slfh.manager.levelmanager.domain.TResLevel;
 import com.business.slfh.manager.levelmanager.mapper.TResLevelMapper;
 import com.business.slfh.manager.levelmanager.mapper.TResLevelMapper;
@@ -12,7 +14,7 @@ import javax.annotation.Resource;
 
 
 /**
 /**
  * 【请填写功能名称】Service业务层处理
  * 【请填写功能名称】Service业务层处理
- * 
+ *
  * @author lei
  * @author lei
  * @date 2020-11-23
  * @date 2020-11-23
  */
  */
@@ -24,7 +26,7 @@ public class TResLevelServiceImpl implements ITResLevelService
 
 
     /**
     /**
      * 查询【请填写功能名称】
      * 查询【请填写功能名称】
-     * 
+     *
      * @param id 【请填写功能名称】ID
      * @param id 【请填写功能名称】ID
      * @return 【请填写功能名称】
      * @return 【请填写功能名称】
      */
      */
@@ -36,7 +38,7 @@ public class TResLevelServiceImpl implements ITResLevelService
 
 
     /**
     /**
      * 查询【请填写功能名称】列表
      * 查询【请填写功能名称】列表
-     * 
+     *
      * @param tResLevel 【请填写功能名称】
      * @param tResLevel 【请填写功能名称】
      * @return 【请填写功能名称】
      * @return 【请填写功能名称】
      */
      */
@@ -53,7 +55,7 @@ public class TResLevelServiceImpl implements ITResLevelService
 
 
     /**
     /**
      * 新增【请填写功能名称】
      * 新增【请填写功能名称】
-     * 
+     *
      * @param tResLevel 【请填写功能名称】
      * @param tResLevel 【请填写功能名称】
      * @return 结果
      * @return 结果
      */
      */
@@ -73,12 +75,17 @@ public class TResLevelServiceImpl implements ITResLevelService
     @Override
     @Override
     public int filterTResLevel(TResLevel tResLevel)
     public int filterTResLevel(TResLevel tResLevel)
     {
     {
-        return tResLevelMapper.selectTResLevelList(tResLevel).size();
+        tResLevel.setRectime(null);
+        SimpleDateFormat f = new SimpleDateFormat("yyyy-MM-dd");
+        String str = f.format(new Date());
+        tResLevel.setRectimeStr(str);
+        List ls = tResLevelMapper.selectTResLevelList(tResLevel);
+        return ls.size();
     }
     }
 
 
     /**
     /**
      * 修改【请填写功能名称】
      * 修改【请填写功能名称】
-     * 
+     *
      * @param tResLevel 【请填写功能名称】
      * @param tResLevel 【请填写功能名称】
      * @return 结果
      * @return 结果
      */
      */
@@ -91,7 +98,7 @@ public class TResLevelServiceImpl implements ITResLevelService
 
 
     /**
     /**
      * 删除【请填写功能名称】对象
      * 删除【请填写功能名称】对象
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @param ids 需要删除的数据ID
      * @return 结果
      * @return 结果
      */
      */
@@ -103,7 +110,7 @@ public class TResLevelServiceImpl implements ITResLevelService
 
 
     /**
     /**
      * 删除【请填写功能名称】信息
      * 删除【请填写功能名称】信息
-     * 
+     *
      * @param id 【请填写功能名称】ID
      * @param id 【请填写功能名称】ID
      * @return 结果
      * @return 结果
      */
      */

+ 1 - 0
mybusiness/src/main/resources/mapper/grid/manager/TResLevelMapper.xml

@@ -40,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND date_format(rectime,'%y%m%d') &lt;= date_format(#{params.endRectime},'%y%m%d')
                 AND date_format(rectime,'%y%m%d') &lt;= date_format(#{params.endRectime},'%y%m%d')
             </if>
             </if>
             <if test="rectime != null "> and rectime = #{rectime}</if>
             <if test="rectime != null "> and rectime = #{rectime}</if>
+            <if test="rectimeStr != null "> and date_format(rectime,'%Y-%m-%d') = #{rectimeStr}</if>
             <if test="weather != null  and weather != ''"> and weather = #{weather}</if>
             <if test="weather != null  and weather != ''"> and weather = #{weather}</if>
             <if test="windPower != null "> and wind_power = #{windPower}</if>
             <if test="windPower != null "> and wind_power = #{windPower}</if>
             <if test="windDirection != null  and windDirection != ''"> and wind_direction = #{windDirection}</if>
             <if test="windDirection != null  and windDirection != ''"> and wind_direction = #{windDirection}</if>