diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ff69e2a..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,27 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190828.docx" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -32,72 +42,119 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="2" />
-          <entry key="java" value="243" />
-          <entry key="properties" value="6" />
+          <entry key="java" value="321" />
+          <entry key="properties" value="8" />
           <entry key="xml" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
-          <entry key="JAVA" value="243" />
-          <entry key="Properties" value="6" />
+          <entry key="JAVA" value="321" />
+          <entry key="Properties" value="8" />
           <entry key="XML" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="8082" />
-          <entry key="properties" value="49" />
-          <entry key="txt" value="64" />
+          <entry key="dummy" value="16" />
+          <entry key="java" value="10723" />
+          <entry key="properties" value="59" />
+          <entry key="txt" value="118" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="8082" />
-          <entry key="PLAIN_TEXT" value="64" />
-          <entry key="Properties" value="49" />
+          <entry key="JAVA" value="10723" />
+          <entry key="PLAIN_TEXT" value="134" />
+          <entry key="Properties" value="59" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="4" />
+          <entry key="project.closed" value="28" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
           <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.24" value="1" />
+          <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="1" />
-          <entry key="project.open.time.3" value="3" />
-          <entry key="project.open.time.31" value="1" />
+          <entry key="project.open.time.28" value="1" />
+          <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.31" value="2" />
           <entry key="project.open.time.37" value="1" />
+          <entry key="project.open.time.39" value="2" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.40" value="1" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="1" />
+          <entry key="project.open.time.44" value="2" />
           <entry key="project.open.time.45" value="2" />
           <entry key="project.open.time.48" value="1" />
           <entry key="project.open.time.49" value="1" />
+          <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.58" value="1" />
           <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.71" value="1" />
+          <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.71" value="2" />
           <entry key="project.open.time.76" value="1" />
-          <entry key="project.opened" value="25" />
+          <entry key="project.opened" value="41" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+            <state relative-caret-position="174">
+              <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
               <folding>
-                <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-                <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="352">
+              <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#787#788#0" expanded="true" />
+                <element signature="e#817#818#0" expanded="true" />
+                <element signature="e#2105#2106#0" expanded="true" />
+                <element signature="e#2135#2136#0" expanded="true" />
+                <element signature="e#2431#2432#0" expanded="true" />
+                <element signature="e#2461#2462#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="638">
+              <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+              <folding>
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -122,6 +179,7 @@
       <find>getPgDeviceByDevType</find>
       <find>message</find>
       <find>getConstructionByType</find>
+      <find>getPgCameraListByPosition</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -130,24 +188,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanTypeDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
@@ -162,17 +207,38 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
       </list>
     </option>
   </component>
@@ -208,16 +274,18 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="3" />
-    <option name="y" value="10" />
-    <option name="width" value="1386" />
-    <option name="height" value="788" />
+    <option name="x" value="1410" />
+    <option name="y" value="117" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -258,7 +326,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -267,16 +335,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -286,7 +345,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="dto" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -296,7 +355,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="manager" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -308,19 +367,10 @@
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="webapp" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -359,6 +409,7 @@
       </deployment>
       <server-settings>
         <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_7" />
+        <option name="JNDI_PORT" value="10991" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -456,7 +507,23 @@
       <workItem from="1566350810712" duration="6803000" />
       <workItem from="1566435787074" duration="10717000" />
       <workItem from="1566521753529" duration="14265000" />
-      <workItem from="1566614176989" duration="5693000" />
+      <workItem from="1566614176989" duration="14059000" />
+      <workItem from="1566780822009" duration="1026000" />
+      <workItem from="1566891563975" duration="284000" />
+      <workItem from="1566893107340" duration="3382000" />
+      <workItem from="1566953794976" duration="11039000" />
+      <workItem from="1567059357700" duration="484000" />
+      <workItem from="1567082835097" duration="1086000" />
+      <workItem from="1567126428020" duration="1539000" />
+      <workItem from="1567129277820" duration="5788000" />
+      <workItem from="1567136008996" duration="2568000" />
+      <workItem from="1567237040302" duration="111000" />
+      <workItem from="1567495626345" duration="2797000" />
+      <workItem from="1567558770152" duration="2352000" />
+      <workItem from="1567577368149" duration="640000" />
+      <workItem from="1567751224608" duration="780000" />
+      <workItem from="1568019299799" duration="695000" />
+      <workItem from="1568082566133" duration="4016000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -493,17 +560,60 @@
       <option name="project" value="LOCAL" />
       <updated>1566553388171</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="整理管线部分">
+      <created>1566620046627</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1566620046627</updated>
+    </task>
+    <task id="LOCAL-00007" summary="合并代码提交">
+      <created>1566781001910</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1566781001910</updated>
+    </task>
+    <task id="LOCAL-00008" summary="合并代码提交">
+      <created>1566963831930</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1566963831930</updated>
+    </task>
+    <task id="LOCAL-00009" summary="修改报警阈值">
+      <created>1566972146710</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1566972146710</updated>
+    </task>
+    <task id="LOCAL-00010" summary="修改巡检维护表字段">
+      <created>1567126525554</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1567126525554</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="142930000" />
+    <option name="totallyTimeSpent" value="189883000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
+    <frame x="1358" y="-8" width="1456" height="916" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29297996" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -511,13 +621,14 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Thumbnails" weight="0.3295082" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.5081967" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.3849105" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
       <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
       <window_info anchor="bottom" id="Spring" order="8" />
       <window_info anchor="bottom" id="Terminal" order="9" />
@@ -539,7 +650,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2193646" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -547,22 +658,23 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.47540984" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
-      <window_info anchor="bottom" id="Spring" order="8" />
-      <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
-      <window_info anchor="bottom" id="Statistic" order="11" />
-      <window_info anchor="bottom" id="Java Enterprise" order="12" />
-      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="14" weight="0.32786885" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.52307695" />
+      <window_info anchor="bottom" id="Thumbnails" order="0" weight="0.3295082" />
+      <window_info anchor="bottom" id="Message" order="1" />
+      <window_info anchor="bottom" id="Find" order="2" />
+      <window_info anchor="bottom" id="Run" order="3" />
+      <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.49924356" weight="0.49344262" />
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Application Servers" order="8" weight="0.3276923" />
+      <window_info anchor="bottom" id="Spring" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
+      <window_info anchor="bottom" id="Statistic" order="12" />
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <window_info anchor="bottom" id="Database Changes" order="14" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="15" weight="0.32786885" />
+      <window_info anchor="bottom" id="Messages" order="16" weight="0.5229508" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -578,6 +690,16 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -587,7 +709,11 @@
     <MESSAGE value="修改权限问题" />
     <MESSAGE value="修改人员登录返回接口" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整理管线部分" />
+    <MESSAGE value="合并代码提交" />
+    <MESSAGE value="修改报警阈值" />
+    <MESSAGE value="修改巡检维护表字段" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护表字段" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -602,322 +728,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-532">
-          <caret line="50" column="28" lean-forward="true" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="19" column="60" selection-start-line="19" selection-start-column="60" selection-end-line="19" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="100" column="34" lean-forward="true" selection-start-line="100" selection-start-column="34" selection-end-line="100" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1474">
-          <caret line="84" column="58" selection-start-line="84" selection-start-column="58" selection-end-line="84" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1100">
-          <caret line="58" column="18" selection-start-line="58" selection-start-column="18" selection-end-line="58" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6842">
-          <caret line="329" selection-start-line="329" selection-end-line="329" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="102" column="24" lean-forward="true" selection-start-line="102" selection-start-column="24" selection-end-line="102" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="72" column="56" lean-forward="true" selection-start-line="72" selection-start-column="56" selection-end-line="72" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="90" column="39" lean-forward="true" selection-start-line="90" selection-start-column="39" selection-end-line="90" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="97" column="16" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
-          <caret line="14" column="52" lean-forward="true" selection-start-line="14" selection-start-column="52" selection-end-line="14" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="26" column="34" lean-forward="true" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="61" column="1" lean-forward="true" selection-start-line="61" selection-start-column="1" selection-end-line="61" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="208" column="49" lean-forward="true" selection-start-line="208" selection-start-column="49" selection-end-line="208" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="140" column="57" selection-start-line="140" selection-start-column="57" selection-end-line="140" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="111" column="36" selection-start-line="111" selection-start-column="36" selection-end-line="111" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="3" lean-forward="true" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="81" column="58" lean-forward="true" selection-start-line="81" selection-start-column="58" selection-end-line="81" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="472">
-          <caret line="118" column="59" selection-start-line="118" selection-start-column="59" selection-end-line="118" selection-end-column="59" />
-          <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-198">
-          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="69" column="32" lean-forward="true" selection-start-line="69" selection-start-column="32" selection-end-line="70" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="142" column="59" lean-forward="true" selection-start-line="142" selection-start-column="59" selection-end-line="142" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="349" column="9" lean-forward="true" selection-start-line="349" selection-start-column="9" selection-end-line="349" selection-end-column="9" />
-          <folding>
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="e#12105#12121#0" expanded="true" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-686">
-          <caret line="67" column="31" lean-forward="true" selection-start-line="67" selection-start-column="31" selection-end-line="67" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="93" column="24" lean-forward="true" selection-start-line="93" selection-start-column="24" selection-end-line="93" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="57" column="23" lean-forward="true" selection-start-line="57" selection-start-column="23" selection-end-line="57" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-408">
-          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="98" column="40" lean-forward="true" selection-start-line="98" selection-start-column="40" selection-end-line="98" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="572">
@@ -925,13 +735,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="328" column="32" lean-forward="true" selection-start-line="328" selection-start-column="32" selection-end-line="328" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
@@ -950,16 +753,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="396">
           <caret line="23" column="32" lean-forward="true" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
-          <folding>
-            <element signature="e#2635#2636#0" expanded="true" />
-            <element signature="e#2671#2672#0" expanded="true" />
-            <element signature="e#2727#2728#0" expanded="true" />
-            <element signature="e#2777#2778#0" expanded="true" />
-            <element signature="e#2877#2878#0" expanded="true" />
-            <element signature="e#2911#2912#0" expanded="true" />
-            <element signature="e#2963#2964#0" expanded="true" />
-            <element signature="e#3009#3010#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -972,14 +765,481 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+        <state relative-caret-position="66">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="59" column="46" lean-forward="true" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3586">
+          <caret line="179" column="16" selection-start-line="179" selection-start-column="16" selection-end-line="179" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5478">
+          <caret line="273" column="3" selection-start-line="273" selection-start-column="3" selection-end-line="273" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1870">
+          <caret line="147" column="11" selection-start-line="147" selection-start-column="11" selection-end-line="147" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="55" column="15" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="106">
+          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="290" column="41" lean-forward="true" selection-start-line="290" selection-start-column="41" selection-end-line="290" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="21" column="32" lean-forward="true" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="550">
+          <caret line="38" column="89" selection-start-line="38" selection-start-column="89" selection-end-line="38" selection-end-column="89" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="11" column="28" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1166">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="818">
+          <caret line="285" column="13" lean-forward="true" selection-start-line="285" selection-start-column="13" selection-end-line="285" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="129" column="31" lean-forward="true" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="323" column="72" lean-forward="true" selection-start-line="323" selection-start-column="72" selection-end-line="323" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="44" column="13" lean-forward="true" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-638">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="244">
+          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="157">
+          <caret line="16" column="55" lean-forward="true" selection-start-line="16" selection-start-column="55" selection-end-line="16" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="270" column="33" lean-forward="true" selection-start-line="270" selection-start-column="33" selection-end-line="270" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="490">
+          <caret line="141" selection-start-line="141" selection-end-line="141" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="164" column="5" lean-forward="true" selection-start-line="164" selection-start-column="5" selection-end-line="164" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/apiTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-242">
+          <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="61" column="16" lean-forward="true" selection-start-line="61" selection-start-column="16" selection-end-line="61" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="700">
+          <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="12" column="34" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="39" column="9" lean-forward="true" selection-start-line="39" selection-start-column="9" selection-end-line="39" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="32" column="29" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="29" />
           <folding>
-            <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-            <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#1838#1839#0" expanded="true" />
+            <element signature="e#1863#1864#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1925#1926#0" expanded="true" />
+            <element signature="e#1822#1823#0" expanded="true" />
+            <element signature="e#1851#1852#0" expanded="true" />
+            <element signature="e#1895#1896#0" expanded="true" />
+            <element signature="e#1931#1932#0" expanded="true" />
+            <element signature="e#2132#2133#0" expanded="true" />
+            <element signature="e#2164#2165#0" expanded="true" />
+            <element signature="e#2214#2215#0" expanded="true" />
+            <element signature="e#2256#2257#0" expanded="true" />
+            <element signature="e#2330#2331#0" expanded="true" />
+            <element signature="e#2370#2371#0" expanded="true" />
+            <element signature="e#2436#2437#0" expanded="true" />
+            <element signature="e#2494#2495#0" expanded="true" />
+            <element signature="e#2569#2570#0" expanded="true" />
+            <element signature="e#2602#2603#0" expanded="true" />
+            <element signature="e#2654#2655#0" expanded="true" />
+            <element signature="e#2698#2699#0" expanded="true" />
+            <element signature="e#2764#2765#0" expanded="true" />
+            <element signature="e#2795#2796#0" expanded="true" />
+            <element signature="e#2843#2844#0" expanded="true" />
+            <element signature="e#2883#2884#0" expanded="true" />
+            <element signature="e#2948#2949#0" expanded="true" />
+            <element signature="e#2980#2981#0" expanded="true" />
+            <element signature="e#3030#3031#0" expanded="true" />
+            <element signature="e#3072#3073#0" expanded="true" />
+            <element signature="e#3134#3135#0" expanded="true" />
+            <element signature="e#3162#3163#0" expanded="true" />
+            <element signature="e#3204#3205#0" expanded="true" />
+            <element signature="e#3238#3239#0" expanded="true" />
+            <element signature="e#3307#3308#0" expanded="true" />
+            <element signature="e#3346#3347#0" expanded="true" />
+            <element signature="e#3410#3411#0" expanded="true" />
+            <element signature="e#3466#3467#0" expanded="true" />
+            <element signature="e#3537#3538#0" expanded="true" />
+            <element signature="e#3567#3568#0" expanded="true" />
+            <element signature="e#3613#3614#0" expanded="true" />
+            <element signature="e#3651#3652#0" expanded="true" />
+            <element signature="e#3721#3722#0" expanded="true" />
+            <element signature="e#3759#3760#0" expanded="true" />
+            <element signature="e#3821#3822#0" expanded="true" />
+            <element signature="e#3875#3876#0" expanded="true" />
+            <element signature="e#3953#3954#0" expanded="true" />
+            <element signature="e#3991#3992#0" expanded="true" />
+            <element signature="e#4053#4054#0" expanded="true" />
+            <element signature="e#4107#4108#0" expanded="true" />
+            <element signature="e#4186#4187#0" expanded="true" />
+            <element signature="e#4225#4226#0" expanded="true" />
+            <element signature="e#4289#4290#0" expanded="true" />
+            <element signature="e#4345#4346#0" expanded="true" />
+            <element signature="e#4430#4431#0" expanded="true" />
+            <element signature="e#4474#4475#0" expanded="true" />
+            <element signature="e#4698#4699#0" expanded="true" />
+            <element signature="e#4740#4741#0" expanded="true" />
+            <element signature="e#4810#4811#0" expanded="true" />
+            <element signature="e#4872#4873#0" expanded="true" />
+            <element signature="e#4955#4956#0" expanded="true" />
+            <element signature="e#4994#4995#0" expanded="true" />
+            <element signature="e#5058#5059#0" expanded="true" />
+            <element signature="e#5114#5115#0" expanded="true" />
+            <element signature="e#5194#5195#0" expanded="true" />
+            <element signature="e#5233#5234#0" expanded="true" />
+            <element signature="e#5297#5298#0" expanded="true" />
+            <element signature="e#5353#5354#0" expanded="true" />
+            <element signature="e#5428#5429#0" expanded="true" />
+            <element signature="e#5462#5463#0" expanded="true" />
+            <element signature="e#5516#5517#0" expanded="true" />
+            <element signature="e#5562#5563#0" expanded="true" />
+            <element signature="e#5634#5635#0" expanded="true" />
+            <element signature="e#5670#5671#0" expanded="true" />
+            <element signature="e#5728#5729#0" expanded="true" />
+            <element signature="e#5778#5779#0" expanded="true" />
+            <element signature="e#5852#5853#0" expanded="true" />
+            <element signature="e#5888#5889#0" expanded="true" />
+            <element signature="e#5946#5947#0" expanded="true" />
+            <element signature="e#5996#5997#0" expanded="true" />
+            <element signature="e#6067#6068#0" expanded="true" />
+            <element signature="e#6100#6101#0" expanded="true" />
+            <element signature="e#6152#6153#0" expanded="true" />
+            <element signature="e#6196#6197#0" expanded="true" />
+            <element signature="e#6261#6262#0" expanded="true" />
+            <element signature="e#6291#6292#0" expanded="true" />
+            <element signature="e#6337#6338#0" expanded="true" />
+            <element signature="e#6375#6376#0" expanded="true" />
+            <element signature="e#6437#6438#0" expanded="true" />
+            <element signature="e#6467#6468#0" expanded="true" />
+            <element signature="e#6513#6514#0" expanded="true" />
+            <element signature="e#6551#6552#0" expanded="true" />
+            <element signature="e#6613#6614#0" expanded="true" />
+            <element signature="e#6643#6644#0" expanded="true" />
+            <element signature="e#6689#6690#0" expanded="true" />
+            <element signature="e#6727#6728#0" expanded="true" />
+            <element signature="e#6796#6797#0" expanded="true" />
+            <element signature="e#6829#6830#0" expanded="true" />
+            <element signature="e#6881#6882#0" expanded="true" />
+            <element signature="e#6925#6926#0" expanded="true" />
+            <element signature="e#6995#6996#0" expanded="true" />
+            <element signature="e#7030#7031#0" expanded="true" />
+            <element signature="e#7086#7087#0" expanded="true" />
+            <element signature="e#7134#7135#0" expanded="true" />
+            <element signature="e#7202#7203#0" expanded="true" />
+            <element signature="e#7233#7234#0" expanded="true" />
+            <element signature="e#7281#7282#0" expanded="true" />
+            <element signature="e#7321#7322#0" expanded="true" />
+            <element signature="e#7390#7391#0" expanded="true" />
+            <element signature="e#7426#7427#0" expanded="true" />
+            <element signature="e#7484#7485#0" expanded="true" />
+            <element signature="e#7534#7535#0" expanded="true" />
+            <element signature="e#7602#7603#0" expanded="true" />
+            <element signature="e#7636#7637#0" expanded="true" />
+            <element signature="e#7690#7691#0" expanded="true" />
+            <element signature="e#7736#7737#0" expanded="true" />
+            <element signature="e#7806#7807#0" expanded="true" />
+            <element signature="e#7840#7841#0" expanded="true" />
+            <element signature="e#7894#7895#0" expanded="true" />
+            <element signature="e#7940#7941#0" expanded="true" />
+            <element signature="e#8006#8007#0" expanded="true" />
+            <element signature="e#8036#8037#0" expanded="true" />
+            <element signature="e#8082#8083#0" expanded="true" />
+            <element signature="e#8120#8121#0" expanded="true" />
+            <element signature="e#8189#8190#0" expanded="true" />
+            <element signature="e#8226#8227#0" expanded="true" />
+            <element signature="e#8286#8287#0" expanded="true" />
+            <element signature="e#8338#8339#0" expanded="true" />
+            <element signature="e#8417#8418#0" expanded="true" />
+            <element signature="e#8457#8458#0" expanded="true" />
+            <element signature="e#8523#8524#0" expanded="true" />
+            <element signature="e#8581#8582#0" expanded="true" />
+            <element signature="e#8655#8656#0" expanded="true" />
+            <element signature="e#8687#8688#0" expanded="true" />
+            <element signature="e#8737#8738#0" expanded="true" />
+            <element signature="e#8779#8780#0" expanded="true" />
+            <element signature="e#8846#8847#0" expanded="true" />
+            <element signature="e#8879#8880#0" expanded="true" />
+            <element signature="e#8931#8932#0" expanded="true" />
+            <element signature="e#8975#8976#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#787#788#0" expanded="true" />
+            <element signature="e#817#818#0" expanded="true" />
+            <element signature="e#2105#2106#0" expanded="true" />
+            <element signature="e#2135#2136#0" expanded="true" />
+            <element signature="e#2431#2432#0" expanded="true" />
+            <element signature="e#2461#2462#0" expanded="true" />
           </folding>
         </state>
       </provider>

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ff69e2a..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,27 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190828.docx" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -32,72 +42,119 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="2" />
-          <entry key="java" value="243" />
-          <entry key="properties" value="6" />
+          <entry key="java" value="321" />
+          <entry key="properties" value="8" />
           <entry key="xml" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
-          <entry key="JAVA" value="243" />
-          <entry key="Properties" value="6" />
+          <entry key="JAVA" value="321" />
+          <entry key="Properties" value="8" />
           <entry key="XML" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="8082" />
-          <entry key="properties" value="49" />
-          <entry key="txt" value="64" />
+          <entry key="dummy" value="16" />
+          <entry key="java" value="10723" />
+          <entry key="properties" value="59" />
+          <entry key="txt" value="118" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="8082" />
-          <entry key="PLAIN_TEXT" value="64" />
-          <entry key="Properties" value="49" />
+          <entry key="JAVA" value="10723" />
+          <entry key="PLAIN_TEXT" value="134" />
+          <entry key="Properties" value="59" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="4" />
+          <entry key="project.closed" value="28" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
           <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.24" value="1" />
+          <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="1" />
-          <entry key="project.open.time.3" value="3" />
-          <entry key="project.open.time.31" value="1" />
+          <entry key="project.open.time.28" value="1" />
+          <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.31" value="2" />
           <entry key="project.open.time.37" value="1" />
+          <entry key="project.open.time.39" value="2" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.40" value="1" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="1" />
+          <entry key="project.open.time.44" value="2" />
           <entry key="project.open.time.45" value="2" />
           <entry key="project.open.time.48" value="1" />
           <entry key="project.open.time.49" value="1" />
+          <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.58" value="1" />
           <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.71" value="1" />
+          <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.71" value="2" />
           <entry key="project.open.time.76" value="1" />
-          <entry key="project.opened" value="25" />
+          <entry key="project.opened" value="41" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+            <state relative-caret-position="174">
+              <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
               <folding>
-                <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-                <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="352">
+              <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#787#788#0" expanded="true" />
+                <element signature="e#817#818#0" expanded="true" />
+                <element signature="e#2105#2106#0" expanded="true" />
+                <element signature="e#2135#2136#0" expanded="true" />
+                <element signature="e#2431#2432#0" expanded="true" />
+                <element signature="e#2461#2462#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="638">
+              <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+              <folding>
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -122,6 +179,7 @@
       <find>getPgDeviceByDevType</find>
       <find>message</find>
       <find>getConstructionByType</find>
+      <find>getPgCameraListByPosition</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -130,24 +188,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanTypeDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
@@ -162,17 +207,38 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
       </list>
     </option>
   </component>
@@ -208,16 +274,18 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="3" />
-    <option name="y" value="10" />
-    <option name="width" value="1386" />
-    <option name="height" value="788" />
+    <option name="x" value="1410" />
+    <option name="y" value="117" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -258,7 +326,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -267,16 +335,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -286,7 +345,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="dto" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -296,7 +355,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="manager" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -308,19 +367,10 @@
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="webapp" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -359,6 +409,7 @@
       </deployment>
       <server-settings>
         <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_7" />
+        <option name="JNDI_PORT" value="10991" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -456,7 +507,23 @@
       <workItem from="1566350810712" duration="6803000" />
       <workItem from="1566435787074" duration="10717000" />
       <workItem from="1566521753529" duration="14265000" />
-      <workItem from="1566614176989" duration="5693000" />
+      <workItem from="1566614176989" duration="14059000" />
+      <workItem from="1566780822009" duration="1026000" />
+      <workItem from="1566891563975" duration="284000" />
+      <workItem from="1566893107340" duration="3382000" />
+      <workItem from="1566953794976" duration="11039000" />
+      <workItem from="1567059357700" duration="484000" />
+      <workItem from="1567082835097" duration="1086000" />
+      <workItem from="1567126428020" duration="1539000" />
+      <workItem from="1567129277820" duration="5788000" />
+      <workItem from="1567136008996" duration="2568000" />
+      <workItem from="1567237040302" duration="111000" />
+      <workItem from="1567495626345" duration="2797000" />
+      <workItem from="1567558770152" duration="2352000" />
+      <workItem from="1567577368149" duration="640000" />
+      <workItem from="1567751224608" duration="780000" />
+      <workItem from="1568019299799" duration="695000" />
+      <workItem from="1568082566133" duration="4016000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -493,17 +560,60 @@
       <option name="project" value="LOCAL" />
       <updated>1566553388171</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="整理管线部分">
+      <created>1566620046627</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1566620046627</updated>
+    </task>
+    <task id="LOCAL-00007" summary="合并代码提交">
+      <created>1566781001910</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1566781001910</updated>
+    </task>
+    <task id="LOCAL-00008" summary="合并代码提交">
+      <created>1566963831930</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1566963831930</updated>
+    </task>
+    <task id="LOCAL-00009" summary="修改报警阈值">
+      <created>1566972146710</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1566972146710</updated>
+    </task>
+    <task id="LOCAL-00010" summary="修改巡检维护表字段">
+      <created>1567126525554</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1567126525554</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="142930000" />
+    <option name="totallyTimeSpent" value="189883000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
+    <frame x="1358" y="-8" width="1456" height="916" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29297996" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -511,13 +621,14 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Thumbnails" weight="0.3295082" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.5081967" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.3849105" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
       <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
       <window_info anchor="bottom" id="Spring" order="8" />
       <window_info anchor="bottom" id="Terminal" order="9" />
@@ -539,7 +650,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2193646" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -547,22 +658,23 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.47540984" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
-      <window_info anchor="bottom" id="Spring" order="8" />
-      <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
-      <window_info anchor="bottom" id="Statistic" order="11" />
-      <window_info anchor="bottom" id="Java Enterprise" order="12" />
-      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="14" weight="0.32786885" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.52307695" />
+      <window_info anchor="bottom" id="Thumbnails" order="0" weight="0.3295082" />
+      <window_info anchor="bottom" id="Message" order="1" />
+      <window_info anchor="bottom" id="Find" order="2" />
+      <window_info anchor="bottom" id="Run" order="3" />
+      <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.49924356" weight="0.49344262" />
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Application Servers" order="8" weight="0.3276923" />
+      <window_info anchor="bottom" id="Spring" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
+      <window_info anchor="bottom" id="Statistic" order="12" />
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <window_info anchor="bottom" id="Database Changes" order="14" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="15" weight="0.32786885" />
+      <window_info anchor="bottom" id="Messages" order="16" weight="0.5229508" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -578,6 +690,16 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -587,7 +709,11 @@
     <MESSAGE value="修改权限问题" />
     <MESSAGE value="修改人员登录返回接口" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整理管线部分" />
+    <MESSAGE value="合并代码提交" />
+    <MESSAGE value="修改报警阈值" />
+    <MESSAGE value="修改巡检维护表字段" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护表字段" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -602,322 +728,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-532">
-          <caret line="50" column="28" lean-forward="true" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="19" column="60" selection-start-line="19" selection-start-column="60" selection-end-line="19" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="100" column="34" lean-forward="true" selection-start-line="100" selection-start-column="34" selection-end-line="100" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1474">
-          <caret line="84" column="58" selection-start-line="84" selection-start-column="58" selection-end-line="84" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1100">
-          <caret line="58" column="18" selection-start-line="58" selection-start-column="18" selection-end-line="58" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6842">
-          <caret line="329" selection-start-line="329" selection-end-line="329" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="102" column="24" lean-forward="true" selection-start-line="102" selection-start-column="24" selection-end-line="102" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="72" column="56" lean-forward="true" selection-start-line="72" selection-start-column="56" selection-end-line="72" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="90" column="39" lean-forward="true" selection-start-line="90" selection-start-column="39" selection-end-line="90" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="97" column="16" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
-          <caret line="14" column="52" lean-forward="true" selection-start-line="14" selection-start-column="52" selection-end-line="14" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="26" column="34" lean-forward="true" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="61" column="1" lean-forward="true" selection-start-line="61" selection-start-column="1" selection-end-line="61" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="208" column="49" lean-forward="true" selection-start-line="208" selection-start-column="49" selection-end-line="208" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="140" column="57" selection-start-line="140" selection-start-column="57" selection-end-line="140" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="111" column="36" selection-start-line="111" selection-start-column="36" selection-end-line="111" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="3" lean-forward="true" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="81" column="58" lean-forward="true" selection-start-line="81" selection-start-column="58" selection-end-line="81" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="472">
-          <caret line="118" column="59" selection-start-line="118" selection-start-column="59" selection-end-line="118" selection-end-column="59" />
-          <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-198">
-          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="69" column="32" lean-forward="true" selection-start-line="69" selection-start-column="32" selection-end-line="70" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="142" column="59" lean-forward="true" selection-start-line="142" selection-start-column="59" selection-end-line="142" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="349" column="9" lean-forward="true" selection-start-line="349" selection-start-column="9" selection-end-line="349" selection-end-column="9" />
-          <folding>
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="e#12105#12121#0" expanded="true" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-686">
-          <caret line="67" column="31" lean-forward="true" selection-start-line="67" selection-start-column="31" selection-end-line="67" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="93" column="24" lean-forward="true" selection-start-line="93" selection-start-column="24" selection-end-line="93" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="57" column="23" lean-forward="true" selection-start-line="57" selection-start-column="23" selection-end-line="57" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-408">
-          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="98" column="40" lean-forward="true" selection-start-line="98" selection-start-column="40" selection-end-line="98" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="572">
@@ -925,13 +735,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="328" column="32" lean-forward="true" selection-start-line="328" selection-start-column="32" selection-end-line="328" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
@@ -950,16 +753,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="396">
           <caret line="23" column="32" lean-forward="true" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
-          <folding>
-            <element signature="e#2635#2636#0" expanded="true" />
-            <element signature="e#2671#2672#0" expanded="true" />
-            <element signature="e#2727#2728#0" expanded="true" />
-            <element signature="e#2777#2778#0" expanded="true" />
-            <element signature="e#2877#2878#0" expanded="true" />
-            <element signature="e#2911#2912#0" expanded="true" />
-            <element signature="e#2963#2964#0" expanded="true" />
-            <element signature="e#3009#3010#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -972,14 +765,481 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+        <state relative-caret-position="66">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="59" column="46" lean-forward="true" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3586">
+          <caret line="179" column="16" selection-start-line="179" selection-start-column="16" selection-end-line="179" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5478">
+          <caret line="273" column="3" selection-start-line="273" selection-start-column="3" selection-end-line="273" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1870">
+          <caret line="147" column="11" selection-start-line="147" selection-start-column="11" selection-end-line="147" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="55" column="15" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="106">
+          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="290" column="41" lean-forward="true" selection-start-line="290" selection-start-column="41" selection-end-line="290" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="21" column="32" lean-forward="true" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="550">
+          <caret line="38" column="89" selection-start-line="38" selection-start-column="89" selection-end-line="38" selection-end-column="89" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="11" column="28" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1166">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="818">
+          <caret line="285" column="13" lean-forward="true" selection-start-line="285" selection-start-column="13" selection-end-line="285" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="129" column="31" lean-forward="true" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="323" column="72" lean-forward="true" selection-start-line="323" selection-start-column="72" selection-end-line="323" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="44" column="13" lean-forward="true" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-638">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="244">
+          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="157">
+          <caret line="16" column="55" lean-forward="true" selection-start-line="16" selection-start-column="55" selection-end-line="16" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="270" column="33" lean-forward="true" selection-start-line="270" selection-start-column="33" selection-end-line="270" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="490">
+          <caret line="141" selection-start-line="141" selection-end-line="141" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="164" column="5" lean-forward="true" selection-start-line="164" selection-start-column="5" selection-end-line="164" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/apiTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-242">
+          <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="61" column="16" lean-forward="true" selection-start-line="61" selection-start-column="16" selection-end-line="61" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="700">
+          <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="12" column="34" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="39" column="9" lean-forward="true" selection-start-line="39" selection-start-column="9" selection-end-line="39" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="32" column="29" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="29" />
           <folding>
-            <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-            <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#1838#1839#0" expanded="true" />
+            <element signature="e#1863#1864#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1925#1926#0" expanded="true" />
+            <element signature="e#1822#1823#0" expanded="true" />
+            <element signature="e#1851#1852#0" expanded="true" />
+            <element signature="e#1895#1896#0" expanded="true" />
+            <element signature="e#1931#1932#0" expanded="true" />
+            <element signature="e#2132#2133#0" expanded="true" />
+            <element signature="e#2164#2165#0" expanded="true" />
+            <element signature="e#2214#2215#0" expanded="true" />
+            <element signature="e#2256#2257#0" expanded="true" />
+            <element signature="e#2330#2331#0" expanded="true" />
+            <element signature="e#2370#2371#0" expanded="true" />
+            <element signature="e#2436#2437#0" expanded="true" />
+            <element signature="e#2494#2495#0" expanded="true" />
+            <element signature="e#2569#2570#0" expanded="true" />
+            <element signature="e#2602#2603#0" expanded="true" />
+            <element signature="e#2654#2655#0" expanded="true" />
+            <element signature="e#2698#2699#0" expanded="true" />
+            <element signature="e#2764#2765#0" expanded="true" />
+            <element signature="e#2795#2796#0" expanded="true" />
+            <element signature="e#2843#2844#0" expanded="true" />
+            <element signature="e#2883#2884#0" expanded="true" />
+            <element signature="e#2948#2949#0" expanded="true" />
+            <element signature="e#2980#2981#0" expanded="true" />
+            <element signature="e#3030#3031#0" expanded="true" />
+            <element signature="e#3072#3073#0" expanded="true" />
+            <element signature="e#3134#3135#0" expanded="true" />
+            <element signature="e#3162#3163#0" expanded="true" />
+            <element signature="e#3204#3205#0" expanded="true" />
+            <element signature="e#3238#3239#0" expanded="true" />
+            <element signature="e#3307#3308#0" expanded="true" />
+            <element signature="e#3346#3347#0" expanded="true" />
+            <element signature="e#3410#3411#0" expanded="true" />
+            <element signature="e#3466#3467#0" expanded="true" />
+            <element signature="e#3537#3538#0" expanded="true" />
+            <element signature="e#3567#3568#0" expanded="true" />
+            <element signature="e#3613#3614#0" expanded="true" />
+            <element signature="e#3651#3652#0" expanded="true" />
+            <element signature="e#3721#3722#0" expanded="true" />
+            <element signature="e#3759#3760#0" expanded="true" />
+            <element signature="e#3821#3822#0" expanded="true" />
+            <element signature="e#3875#3876#0" expanded="true" />
+            <element signature="e#3953#3954#0" expanded="true" />
+            <element signature="e#3991#3992#0" expanded="true" />
+            <element signature="e#4053#4054#0" expanded="true" />
+            <element signature="e#4107#4108#0" expanded="true" />
+            <element signature="e#4186#4187#0" expanded="true" />
+            <element signature="e#4225#4226#0" expanded="true" />
+            <element signature="e#4289#4290#0" expanded="true" />
+            <element signature="e#4345#4346#0" expanded="true" />
+            <element signature="e#4430#4431#0" expanded="true" />
+            <element signature="e#4474#4475#0" expanded="true" />
+            <element signature="e#4698#4699#0" expanded="true" />
+            <element signature="e#4740#4741#0" expanded="true" />
+            <element signature="e#4810#4811#0" expanded="true" />
+            <element signature="e#4872#4873#0" expanded="true" />
+            <element signature="e#4955#4956#0" expanded="true" />
+            <element signature="e#4994#4995#0" expanded="true" />
+            <element signature="e#5058#5059#0" expanded="true" />
+            <element signature="e#5114#5115#0" expanded="true" />
+            <element signature="e#5194#5195#0" expanded="true" />
+            <element signature="e#5233#5234#0" expanded="true" />
+            <element signature="e#5297#5298#0" expanded="true" />
+            <element signature="e#5353#5354#0" expanded="true" />
+            <element signature="e#5428#5429#0" expanded="true" />
+            <element signature="e#5462#5463#0" expanded="true" />
+            <element signature="e#5516#5517#0" expanded="true" />
+            <element signature="e#5562#5563#0" expanded="true" />
+            <element signature="e#5634#5635#0" expanded="true" />
+            <element signature="e#5670#5671#0" expanded="true" />
+            <element signature="e#5728#5729#0" expanded="true" />
+            <element signature="e#5778#5779#0" expanded="true" />
+            <element signature="e#5852#5853#0" expanded="true" />
+            <element signature="e#5888#5889#0" expanded="true" />
+            <element signature="e#5946#5947#0" expanded="true" />
+            <element signature="e#5996#5997#0" expanded="true" />
+            <element signature="e#6067#6068#0" expanded="true" />
+            <element signature="e#6100#6101#0" expanded="true" />
+            <element signature="e#6152#6153#0" expanded="true" />
+            <element signature="e#6196#6197#0" expanded="true" />
+            <element signature="e#6261#6262#0" expanded="true" />
+            <element signature="e#6291#6292#0" expanded="true" />
+            <element signature="e#6337#6338#0" expanded="true" />
+            <element signature="e#6375#6376#0" expanded="true" />
+            <element signature="e#6437#6438#0" expanded="true" />
+            <element signature="e#6467#6468#0" expanded="true" />
+            <element signature="e#6513#6514#0" expanded="true" />
+            <element signature="e#6551#6552#0" expanded="true" />
+            <element signature="e#6613#6614#0" expanded="true" />
+            <element signature="e#6643#6644#0" expanded="true" />
+            <element signature="e#6689#6690#0" expanded="true" />
+            <element signature="e#6727#6728#0" expanded="true" />
+            <element signature="e#6796#6797#0" expanded="true" />
+            <element signature="e#6829#6830#0" expanded="true" />
+            <element signature="e#6881#6882#0" expanded="true" />
+            <element signature="e#6925#6926#0" expanded="true" />
+            <element signature="e#6995#6996#0" expanded="true" />
+            <element signature="e#7030#7031#0" expanded="true" />
+            <element signature="e#7086#7087#0" expanded="true" />
+            <element signature="e#7134#7135#0" expanded="true" />
+            <element signature="e#7202#7203#0" expanded="true" />
+            <element signature="e#7233#7234#0" expanded="true" />
+            <element signature="e#7281#7282#0" expanded="true" />
+            <element signature="e#7321#7322#0" expanded="true" />
+            <element signature="e#7390#7391#0" expanded="true" />
+            <element signature="e#7426#7427#0" expanded="true" />
+            <element signature="e#7484#7485#0" expanded="true" />
+            <element signature="e#7534#7535#0" expanded="true" />
+            <element signature="e#7602#7603#0" expanded="true" />
+            <element signature="e#7636#7637#0" expanded="true" />
+            <element signature="e#7690#7691#0" expanded="true" />
+            <element signature="e#7736#7737#0" expanded="true" />
+            <element signature="e#7806#7807#0" expanded="true" />
+            <element signature="e#7840#7841#0" expanded="true" />
+            <element signature="e#7894#7895#0" expanded="true" />
+            <element signature="e#7940#7941#0" expanded="true" />
+            <element signature="e#8006#8007#0" expanded="true" />
+            <element signature="e#8036#8037#0" expanded="true" />
+            <element signature="e#8082#8083#0" expanded="true" />
+            <element signature="e#8120#8121#0" expanded="true" />
+            <element signature="e#8189#8190#0" expanded="true" />
+            <element signature="e#8226#8227#0" expanded="true" />
+            <element signature="e#8286#8287#0" expanded="true" />
+            <element signature="e#8338#8339#0" expanded="true" />
+            <element signature="e#8417#8418#0" expanded="true" />
+            <element signature="e#8457#8458#0" expanded="true" />
+            <element signature="e#8523#8524#0" expanded="true" />
+            <element signature="e#8581#8582#0" expanded="true" />
+            <element signature="e#8655#8656#0" expanded="true" />
+            <element signature="e#8687#8688#0" expanded="true" />
+            <element signature="e#8737#8738#0" expanded="true" />
+            <element signature="e#8779#8780#0" expanded="true" />
+            <element signature="e#8846#8847#0" expanded="true" />
+            <element signature="e#8879#8880#0" expanded="true" />
+            <element signature="e#8931#8932#0" expanded="true" />
+            <element signature="e#8975#8976#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#787#788#0" expanded="true" />
+            <element signature="e#817#818#0" expanded="true" />
+            <element signature="e#2105#2106#0" expanded="true" />
+            <element signature="e#2135#2136#0" expanded="true" />
+            <element signature="e#2431#2432#0" expanded="true" />
+            <element signature="e#2461#2462#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index 854f1f1..0db633a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -165,12 +165,16 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String startDay,String endDay) {
+    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew) {
         try {
 
             Criteria criteria = createCriteria(PgAlarm.class);
             criteria.addOrder(Order.desc("id"));
 
+            if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) {
+                criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
+            }
+
             if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay))
             {
                 criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay)));
@@ -193,9 +197,11 @@
 
                 criteria.add(Restrictions.le("alarmDate",date));
             }
+            if(StringUtils.isNotBlank(isNew)&&isNew.equals("true"))
+                criteria.add(Restrictions.eq("active", 1));
 
             List<PgAlarm> pgAlarmList = criteria.list();
-            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ff69e2a..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,27 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190828.docx" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -32,72 +42,119 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="2" />
-          <entry key="java" value="243" />
-          <entry key="properties" value="6" />
+          <entry key="java" value="321" />
+          <entry key="properties" value="8" />
           <entry key="xml" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
-          <entry key="JAVA" value="243" />
-          <entry key="Properties" value="6" />
+          <entry key="JAVA" value="321" />
+          <entry key="Properties" value="8" />
           <entry key="XML" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="8082" />
-          <entry key="properties" value="49" />
-          <entry key="txt" value="64" />
+          <entry key="dummy" value="16" />
+          <entry key="java" value="10723" />
+          <entry key="properties" value="59" />
+          <entry key="txt" value="118" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="8082" />
-          <entry key="PLAIN_TEXT" value="64" />
-          <entry key="Properties" value="49" />
+          <entry key="JAVA" value="10723" />
+          <entry key="PLAIN_TEXT" value="134" />
+          <entry key="Properties" value="59" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="4" />
+          <entry key="project.closed" value="28" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
           <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.24" value="1" />
+          <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="1" />
-          <entry key="project.open.time.3" value="3" />
-          <entry key="project.open.time.31" value="1" />
+          <entry key="project.open.time.28" value="1" />
+          <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.31" value="2" />
           <entry key="project.open.time.37" value="1" />
+          <entry key="project.open.time.39" value="2" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.40" value="1" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="1" />
+          <entry key="project.open.time.44" value="2" />
           <entry key="project.open.time.45" value="2" />
           <entry key="project.open.time.48" value="1" />
           <entry key="project.open.time.49" value="1" />
+          <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.58" value="1" />
           <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.71" value="1" />
+          <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.71" value="2" />
           <entry key="project.open.time.76" value="1" />
-          <entry key="project.opened" value="25" />
+          <entry key="project.opened" value="41" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+            <state relative-caret-position="174">
+              <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
               <folding>
-                <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-                <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="352">
+              <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#787#788#0" expanded="true" />
+                <element signature="e#817#818#0" expanded="true" />
+                <element signature="e#2105#2106#0" expanded="true" />
+                <element signature="e#2135#2136#0" expanded="true" />
+                <element signature="e#2431#2432#0" expanded="true" />
+                <element signature="e#2461#2462#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="638">
+              <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+              <folding>
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -122,6 +179,7 @@
       <find>getPgDeviceByDevType</find>
       <find>message</find>
       <find>getConstructionByType</find>
+      <find>getPgCameraListByPosition</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -130,24 +188,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanTypeDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
@@ -162,17 +207,38 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
       </list>
     </option>
   </component>
@@ -208,16 +274,18 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="3" />
-    <option name="y" value="10" />
-    <option name="width" value="1386" />
-    <option name="height" value="788" />
+    <option name="x" value="1410" />
+    <option name="y" value="117" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -258,7 +326,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -267,16 +335,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -286,7 +345,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="dto" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -296,7 +355,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="manager" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -308,19 +367,10 @@
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="webapp" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -359,6 +409,7 @@
       </deployment>
       <server-settings>
         <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_7" />
+        <option name="JNDI_PORT" value="10991" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -456,7 +507,23 @@
       <workItem from="1566350810712" duration="6803000" />
       <workItem from="1566435787074" duration="10717000" />
       <workItem from="1566521753529" duration="14265000" />
-      <workItem from="1566614176989" duration="5693000" />
+      <workItem from="1566614176989" duration="14059000" />
+      <workItem from="1566780822009" duration="1026000" />
+      <workItem from="1566891563975" duration="284000" />
+      <workItem from="1566893107340" duration="3382000" />
+      <workItem from="1566953794976" duration="11039000" />
+      <workItem from="1567059357700" duration="484000" />
+      <workItem from="1567082835097" duration="1086000" />
+      <workItem from="1567126428020" duration="1539000" />
+      <workItem from="1567129277820" duration="5788000" />
+      <workItem from="1567136008996" duration="2568000" />
+      <workItem from="1567237040302" duration="111000" />
+      <workItem from="1567495626345" duration="2797000" />
+      <workItem from="1567558770152" duration="2352000" />
+      <workItem from="1567577368149" duration="640000" />
+      <workItem from="1567751224608" duration="780000" />
+      <workItem from="1568019299799" duration="695000" />
+      <workItem from="1568082566133" duration="4016000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -493,17 +560,60 @@
       <option name="project" value="LOCAL" />
       <updated>1566553388171</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="整理管线部分">
+      <created>1566620046627</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1566620046627</updated>
+    </task>
+    <task id="LOCAL-00007" summary="合并代码提交">
+      <created>1566781001910</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1566781001910</updated>
+    </task>
+    <task id="LOCAL-00008" summary="合并代码提交">
+      <created>1566963831930</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1566963831930</updated>
+    </task>
+    <task id="LOCAL-00009" summary="修改报警阈值">
+      <created>1566972146710</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1566972146710</updated>
+    </task>
+    <task id="LOCAL-00010" summary="修改巡检维护表字段">
+      <created>1567126525554</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1567126525554</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="142930000" />
+    <option name="totallyTimeSpent" value="189883000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
+    <frame x="1358" y="-8" width="1456" height="916" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29297996" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -511,13 +621,14 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Thumbnails" weight="0.3295082" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.5081967" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.3849105" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
       <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
       <window_info anchor="bottom" id="Spring" order="8" />
       <window_info anchor="bottom" id="Terminal" order="9" />
@@ -539,7 +650,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2193646" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -547,22 +658,23 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.47540984" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
-      <window_info anchor="bottom" id="Spring" order="8" />
-      <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
-      <window_info anchor="bottom" id="Statistic" order="11" />
-      <window_info anchor="bottom" id="Java Enterprise" order="12" />
-      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="14" weight="0.32786885" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.52307695" />
+      <window_info anchor="bottom" id="Thumbnails" order="0" weight="0.3295082" />
+      <window_info anchor="bottom" id="Message" order="1" />
+      <window_info anchor="bottom" id="Find" order="2" />
+      <window_info anchor="bottom" id="Run" order="3" />
+      <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.49924356" weight="0.49344262" />
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Application Servers" order="8" weight="0.3276923" />
+      <window_info anchor="bottom" id="Spring" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
+      <window_info anchor="bottom" id="Statistic" order="12" />
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <window_info anchor="bottom" id="Database Changes" order="14" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="15" weight="0.32786885" />
+      <window_info anchor="bottom" id="Messages" order="16" weight="0.5229508" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -578,6 +690,16 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -587,7 +709,11 @@
     <MESSAGE value="修改权限问题" />
     <MESSAGE value="修改人员登录返回接口" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整理管线部分" />
+    <MESSAGE value="合并代码提交" />
+    <MESSAGE value="修改报警阈值" />
+    <MESSAGE value="修改巡检维护表字段" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护表字段" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -602,322 +728,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-532">
-          <caret line="50" column="28" lean-forward="true" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="19" column="60" selection-start-line="19" selection-start-column="60" selection-end-line="19" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="100" column="34" lean-forward="true" selection-start-line="100" selection-start-column="34" selection-end-line="100" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1474">
-          <caret line="84" column="58" selection-start-line="84" selection-start-column="58" selection-end-line="84" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1100">
-          <caret line="58" column="18" selection-start-line="58" selection-start-column="18" selection-end-line="58" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6842">
-          <caret line="329" selection-start-line="329" selection-end-line="329" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="102" column="24" lean-forward="true" selection-start-line="102" selection-start-column="24" selection-end-line="102" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="72" column="56" lean-forward="true" selection-start-line="72" selection-start-column="56" selection-end-line="72" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="90" column="39" lean-forward="true" selection-start-line="90" selection-start-column="39" selection-end-line="90" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="97" column="16" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
-          <caret line="14" column="52" lean-forward="true" selection-start-line="14" selection-start-column="52" selection-end-line="14" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="26" column="34" lean-forward="true" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="61" column="1" lean-forward="true" selection-start-line="61" selection-start-column="1" selection-end-line="61" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="208" column="49" lean-forward="true" selection-start-line="208" selection-start-column="49" selection-end-line="208" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="140" column="57" selection-start-line="140" selection-start-column="57" selection-end-line="140" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="111" column="36" selection-start-line="111" selection-start-column="36" selection-end-line="111" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="3" lean-forward="true" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="81" column="58" lean-forward="true" selection-start-line="81" selection-start-column="58" selection-end-line="81" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="472">
-          <caret line="118" column="59" selection-start-line="118" selection-start-column="59" selection-end-line="118" selection-end-column="59" />
-          <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-198">
-          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="69" column="32" lean-forward="true" selection-start-line="69" selection-start-column="32" selection-end-line="70" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="142" column="59" lean-forward="true" selection-start-line="142" selection-start-column="59" selection-end-line="142" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="349" column="9" lean-forward="true" selection-start-line="349" selection-start-column="9" selection-end-line="349" selection-end-column="9" />
-          <folding>
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="e#12105#12121#0" expanded="true" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-686">
-          <caret line="67" column="31" lean-forward="true" selection-start-line="67" selection-start-column="31" selection-end-line="67" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="93" column="24" lean-forward="true" selection-start-line="93" selection-start-column="24" selection-end-line="93" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="57" column="23" lean-forward="true" selection-start-line="57" selection-start-column="23" selection-end-line="57" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-408">
-          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="98" column="40" lean-forward="true" selection-start-line="98" selection-start-column="40" selection-end-line="98" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="572">
@@ -925,13 +735,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="328" column="32" lean-forward="true" selection-start-line="328" selection-start-column="32" selection-end-line="328" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
@@ -950,16 +753,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="396">
           <caret line="23" column="32" lean-forward="true" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
-          <folding>
-            <element signature="e#2635#2636#0" expanded="true" />
-            <element signature="e#2671#2672#0" expanded="true" />
-            <element signature="e#2727#2728#0" expanded="true" />
-            <element signature="e#2777#2778#0" expanded="true" />
-            <element signature="e#2877#2878#0" expanded="true" />
-            <element signature="e#2911#2912#0" expanded="true" />
-            <element signature="e#2963#2964#0" expanded="true" />
-            <element signature="e#3009#3010#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -972,14 +765,481 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+        <state relative-caret-position="66">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="59" column="46" lean-forward="true" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3586">
+          <caret line="179" column="16" selection-start-line="179" selection-start-column="16" selection-end-line="179" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5478">
+          <caret line="273" column="3" selection-start-line="273" selection-start-column="3" selection-end-line="273" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1870">
+          <caret line="147" column="11" selection-start-line="147" selection-start-column="11" selection-end-line="147" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="55" column="15" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="106">
+          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="290" column="41" lean-forward="true" selection-start-line="290" selection-start-column="41" selection-end-line="290" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="21" column="32" lean-forward="true" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="550">
+          <caret line="38" column="89" selection-start-line="38" selection-start-column="89" selection-end-line="38" selection-end-column="89" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="11" column="28" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1166">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="818">
+          <caret line="285" column="13" lean-forward="true" selection-start-line="285" selection-start-column="13" selection-end-line="285" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="129" column="31" lean-forward="true" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="323" column="72" lean-forward="true" selection-start-line="323" selection-start-column="72" selection-end-line="323" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="44" column="13" lean-forward="true" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-638">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="244">
+          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="157">
+          <caret line="16" column="55" lean-forward="true" selection-start-line="16" selection-start-column="55" selection-end-line="16" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="270" column="33" lean-forward="true" selection-start-line="270" selection-start-column="33" selection-end-line="270" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="490">
+          <caret line="141" selection-start-line="141" selection-end-line="141" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="164" column="5" lean-forward="true" selection-start-line="164" selection-start-column="5" selection-end-line="164" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/apiTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-242">
+          <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="61" column="16" lean-forward="true" selection-start-line="61" selection-start-column="16" selection-end-line="61" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="700">
+          <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="12" column="34" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="39" column="9" lean-forward="true" selection-start-line="39" selection-start-column="9" selection-end-line="39" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="32" column="29" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="29" />
           <folding>
-            <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-            <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#1838#1839#0" expanded="true" />
+            <element signature="e#1863#1864#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1925#1926#0" expanded="true" />
+            <element signature="e#1822#1823#0" expanded="true" />
+            <element signature="e#1851#1852#0" expanded="true" />
+            <element signature="e#1895#1896#0" expanded="true" />
+            <element signature="e#1931#1932#0" expanded="true" />
+            <element signature="e#2132#2133#0" expanded="true" />
+            <element signature="e#2164#2165#0" expanded="true" />
+            <element signature="e#2214#2215#0" expanded="true" />
+            <element signature="e#2256#2257#0" expanded="true" />
+            <element signature="e#2330#2331#0" expanded="true" />
+            <element signature="e#2370#2371#0" expanded="true" />
+            <element signature="e#2436#2437#0" expanded="true" />
+            <element signature="e#2494#2495#0" expanded="true" />
+            <element signature="e#2569#2570#0" expanded="true" />
+            <element signature="e#2602#2603#0" expanded="true" />
+            <element signature="e#2654#2655#0" expanded="true" />
+            <element signature="e#2698#2699#0" expanded="true" />
+            <element signature="e#2764#2765#0" expanded="true" />
+            <element signature="e#2795#2796#0" expanded="true" />
+            <element signature="e#2843#2844#0" expanded="true" />
+            <element signature="e#2883#2884#0" expanded="true" />
+            <element signature="e#2948#2949#0" expanded="true" />
+            <element signature="e#2980#2981#0" expanded="true" />
+            <element signature="e#3030#3031#0" expanded="true" />
+            <element signature="e#3072#3073#0" expanded="true" />
+            <element signature="e#3134#3135#0" expanded="true" />
+            <element signature="e#3162#3163#0" expanded="true" />
+            <element signature="e#3204#3205#0" expanded="true" />
+            <element signature="e#3238#3239#0" expanded="true" />
+            <element signature="e#3307#3308#0" expanded="true" />
+            <element signature="e#3346#3347#0" expanded="true" />
+            <element signature="e#3410#3411#0" expanded="true" />
+            <element signature="e#3466#3467#0" expanded="true" />
+            <element signature="e#3537#3538#0" expanded="true" />
+            <element signature="e#3567#3568#0" expanded="true" />
+            <element signature="e#3613#3614#0" expanded="true" />
+            <element signature="e#3651#3652#0" expanded="true" />
+            <element signature="e#3721#3722#0" expanded="true" />
+            <element signature="e#3759#3760#0" expanded="true" />
+            <element signature="e#3821#3822#0" expanded="true" />
+            <element signature="e#3875#3876#0" expanded="true" />
+            <element signature="e#3953#3954#0" expanded="true" />
+            <element signature="e#3991#3992#0" expanded="true" />
+            <element signature="e#4053#4054#0" expanded="true" />
+            <element signature="e#4107#4108#0" expanded="true" />
+            <element signature="e#4186#4187#0" expanded="true" />
+            <element signature="e#4225#4226#0" expanded="true" />
+            <element signature="e#4289#4290#0" expanded="true" />
+            <element signature="e#4345#4346#0" expanded="true" />
+            <element signature="e#4430#4431#0" expanded="true" />
+            <element signature="e#4474#4475#0" expanded="true" />
+            <element signature="e#4698#4699#0" expanded="true" />
+            <element signature="e#4740#4741#0" expanded="true" />
+            <element signature="e#4810#4811#0" expanded="true" />
+            <element signature="e#4872#4873#0" expanded="true" />
+            <element signature="e#4955#4956#0" expanded="true" />
+            <element signature="e#4994#4995#0" expanded="true" />
+            <element signature="e#5058#5059#0" expanded="true" />
+            <element signature="e#5114#5115#0" expanded="true" />
+            <element signature="e#5194#5195#0" expanded="true" />
+            <element signature="e#5233#5234#0" expanded="true" />
+            <element signature="e#5297#5298#0" expanded="true" />
+            <element signature="e#5353#5354#0" expanded="true" />
+            <element signature="e#5428#5429#0" expanded="true" />
+            <element signature="e#5462#5463#0" expanded="true" />
+            <element signature="e#5516#5517#0" expanded="true" />
+            <element signature="e#5562#5563#0" expanded="true" />
+            <element signature="e#5634#5635#0" expanded="true" />
+            <element signature="e#5670#5671#0" expanded="true" />
+            <element signature="e#5728#5729#0" expanded="true" />
+            <element signature="e#5778#5779#0" expanded="true" />
+            <element signature="e#5852#5853#0" expanded="true" />
+            <element signature="e#5888#5889#0" expanded="true" />
+            <element signature="e#5946#5947#0" expanded="true" />
+            <element signature="e#5996#5997#0" expanded="true" />
+            <element signature="e#6067#6068#0" expanded="true" />
+            <element signature="e#6100#6101#0" expanded="true" />
+            <element signature="e#6152#6153#0" expanded="true" />
+            <element signature="e#6196#6197#0" expanded="true" />
+            <element signature="e#6261#6262#0" expanded="true" />
+            <element signature="e#6291#6292#0" expanded="true" />
+            <element signature="e#6337#6338#0" expanded="true" />
+            <element signature="e#6375#6376#0" expanded="true" />
+            <element signature="e#6437#6438#0" expanded="true" />
+            <element signature="e#6467#6468#0" expanded="true" />
+            <element signature="e#6513#6514#0" expanded="true" />
+            <element signature="e#6551#6552#0" expanded="true" />
+            <element signature="e#6613#6614#0" expanded="true" />
+            <element signature="e#6643#6644#0" expanded="true" />
+            <element signature="e#6689#6690#0" expanded="true" />
+            <element signature="e#6727#6728#0" expanded="true" />
+            <element signature="e#6796#6797#0" expanded="true" />
+            <element signature="e#6829#6830#0" expanded="true" />
+            <element signature="e#6881#6882#0" expanded="true" />
+            <element signature="e#6925#6926#0" expanded="true" />
+            <element signature="e#6995#6996#0" expanded="true" />
+            <element signature="e#7030#7031#0" expanded="true" />
+            <element signature="e#7086#7087#0" expanded="true" />
+            <element signature="e#7134#7135#0" expanded="true" />
+            <element signature="e#7202#7203#0" expanded="true" />
+            <element signature="e#7233#7234#0" expanded="true" />
+            <element signature="e#7281#7282#0" expanded="true" />
+            <element signature="e#7321#7322#0" expanded="true" />
+            <element signature="e#7390#7391#0" expanded="true" />
+            <element signature="e#7426#7427#0" expanded="true" />
+            <element signature="e#7484#7485#0" expanded="true" />
+            <element signature="e#7534#7535#0" expanded="true" />
+            <element signature="e#7602#7603#0" expanded="true" />
+            <element signature="e#7636#7637#0" expanded="true" />
+            <element signature="e#7690#7691#0" expanded="true" />
+            <element signature="e#7736#7737#0" expanded="true" />
+            <element signature="e#7806#7807#0" expanded="true" />
+            <element signature="e#7840#7841#0" expanded="true" />
+            <element signature="e#7894#7895#0" expanded="true" />
+            <element signature="e#7940#7941#0" expanded="true" />
+            <element signature="e#8006#8007#0" expanded="true" />
+            <element signature="e#8036#8037#0" expanded="true" />
+            <element signature="e#8082#8083#0" expanded="true" />
+            <element signature="e#8120#8121#0" expanded="true" />
+            <element signature="e#8189#8190#0" expanded="true" />
+            <element signature="e#8226#8227#0" expanded="true" />
+            <element signature="e#8286#8287#0" expanded="true" />
+            <element signature="e#8338#8339#0" expanded="true" />
+            <element signature="e#8417#8418#0" expanded="true" />
+            <element signature="e#8457#8458#0" expanded="true" />
+            <element signature="e#8523#8524#0" expanded="true" />
+            <element signature="e#8581#8582#0" expanded="true" />
+            <element signature="e#8655#8656#0" expanded="true" />
+            <element signature="e#8687#8688#0" expanded="true" />
+            <element signature="e#8737#8738#0" expanded="true" />
+            <element signature="e#8779#8780#0" expanded="true" />
+            <element signature="e#8846#8847#0" expanded="true" />
+            <element signature="e#8879#8880#0" expanded="true" />
+            <element signature="e#8931#8932#0" expanded="true" />
+            <element signature="e#8975#8976#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#787#788#0" expanded="true" />
+            <element signature="e#817#818#0" expanded="true" />
+            <element signature="e#2105#2106#0" expanded="true" />
+            <element signature="e#2135#2136#0" expanded="true" />
+            <element signature="e#2431#2432#0" expanded="true" />
+            <element signature="e#2461#2462#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index 854f1f1..0db633a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -165,12 +165,16 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String startDay,String endDay) {
+    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew) {
         try {
 
             Criteria criteria = createCriteria(PgAlarm.class);
             criteria.addOrder(Order.desc("id"));
 
+            if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) {
+                criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
+            }
+
             if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay))
             {
                 criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay)));
@@ -193,9 +197,11 @@
 
                 criteria.add(Restrictions.le("alarmDate",date));
             }
+            if(StringUtils.isNotBlank(isNew)&&isNew.equals("true"))
+                criteria.add(Restrictions.eq("active", 1));
 
             List<PgAlarm> pgAlarmList = criteria.list();
-            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
     }
 
     //根据设备位置(仓位)获取摄像机列表
-    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+    public List<PgDeviceDto> getPgCameraListByPosition(String partition,String position){
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.like("position",position+"%"));
-//        criteria.add(Restrictions.eq("devType","球机"));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(position))
+            criteria.add(Restrictions.like("position",position+"%"));
+
         criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
 
         List<PgDevice> pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
             dto.setDevCode(objects[5].toString());
             dto.setDevType(objects[6].toString());
             if(objects[7]!=null)
-            dto.setIp(objects[7].toString());
+                dto.setIp(objects[7].toString());
             dto.setIsOpen(objects[8].toString());
             dto.setPartition(objects[11].toString());
             dto.setPipeGallery(objects[12].toString());

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ff69e2a..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,27 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190828.docx" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -32,72 +42,119 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="2" />
-          <entry key="java" value="243" />
-          <entry key="properties" value="6" />
+          <entry key="java" value="321" />
+          <entry key="properties" value="8" />
           <entry key="xml" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
-          <entry key="JAVA" value="243" />
-          <entry key="Properties" value="6" />
+          <entry key="JAVA" value="321" />
+          <entry key="Properties" value="8" />
           <entry key="XML" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="8082" />
-          <entry key="properties" value="49" />
-          <entry key="txt" value="64" />
+          <entry key="dummy" value="16" />
+          <entry key="java" value="10723" />
+          <entry key="properties" value="59" />
+          <entry key="txt" value="118" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="8082" />
-          <entry key="PLAIN_TEXT" value="64" />
-          <entry key="Properties" value="49" />
+          <entry key="JAVA" value="10723" />
+          <entry key="PLAIN_TEXT" value="134" />
+          <entry key="Properties" value="59" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="4" />
+          <entry key="project.closed" value="28" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
           <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.24" value="1" />
+          <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="1" />
-          <entry key="project.open.time.3" value="3" />
-          <entry key="project.open.time.31" value="1" />
+          <entry key="project.open.time.28" value="1" />
+          <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.31" value="2" />
           <entry key="project.open.time.37" value="1" />
+          <entry key="project.open.time.39" value="2" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.40" value="1" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="1" />
+          <entry key="project.open.time.44" value="2" />
           <entry key="project.open.time.45" value="2" />
           <entry key="project.open.time.48" value="1" />
           <entry key="project.open.time.49" value="1" />
+          <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.58" value="1" />
           <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.71" value="1" />
+          <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.71" value="2" />
           <entry key="project.open.time.76" value="1" />
-          <entry key="project.opened" value="25" />
+          <entry key="project.opened" value="41" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+            <state relative-caret-position="174">
+              <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
               <folding>
-                <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-                <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="352">
+              <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#787#788#0" expanded="true" />
+                <element signature="e#817#818#0" expanded="true" />
+                <element signature="e#2105#2106#0" expanded="true" />
+                <element signature="e#2135#2136#0" expanded="true" />
+                <element signature="e#2431#2432#0" expanded="true" />
+                <element signature="e#2461#2462#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="638">
+              <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+              <folding>
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -122,6 +179,7 @@
       <find>getPgDeviceByDevType</find>
       <find>message</find>
       <find>getConstructionByType</find>
+      <find>getPgCameraListByPosition</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -130,24 +188,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanTypeDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
@@ -162,17 +207,38 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
       </list>
     </option>
   </component>
@@ -208,16 +274,18 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="3" />
-    <option name="y" value="10" />
-    <option name="width" value="1386" />
-    <option name="height" value="788" />
+    <option name="x" value="1410" />
+    <option name="y" value="117" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -258,7 +326,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -267,16 +335,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -286,7 +345,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="dto" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -296,7 +355,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="manager" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -308,19 +367,10 @@
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="webapp" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -359,6 +409,7 @@
       </deployment>
       <server-settings>
         <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_7" />
+        <option name="JNDI_PORT" value="10991" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -456,7 +507,23 @@
       <workItem from="1566350810712" duration="6803000" />
       <workItem from="1566435787074" duration="10717000" />
       <workItem from="1566521753529" duration="14265000" />
-      <workItem from="1566614176989" duration="5693000" />
+      <workItem from="1566614176989" duration="14059000" />
+      <workItem from="1566780822009" duration="1026000" />
+      <workItem from="1566891563975" duration="284000" />
+      <workItem from="1566893107340" duration="3382000" />
+      <workItem from="1566953794976" duration="11039000" />
+      <workItem from="1567059357700" duration="484000" />
+      <workItem from="1567082835097" duration="1086000" />
+      <workItem from="1567126428020" duration="1539000" />
+      <workItem from="1567129277820" duration="5788000" />
+      <workItem from="1567136008996" duration="2568000" />
+      <workItem from="1567237040302" duration="111000" />
+      <workItem from="1567495626345" duration="2797000" />
+      <workItem from="1567558770152" duration="2352000" />
+      <workItem from="1567577368149" duration="640000" />
+      <workItem from="1567751224608" duration="780000" />
+      <workItem from="1568019299799" duration="695000" />
+      <workItem from="1568082566133" duration="4016000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -493,17 +560,60 @@
       <option name="project" value="LOCAL" />
       <updated>1566553388171</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="整理管线部分">
+      <created>1566620046627</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1566620046627</updated>
+    </task>
+    <task id="LOCAL-00007" summary="合并代码提交">
+      <created>1566781001910</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1566781001910</updated>
+    </task>
+    <task id="LOCAL-00008" summary="合并代码提交">
+      <created>1566963831930</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1566963831930</updated>
+    </task>
+    <task id="LOCAL-00009" summary="修改报警阈值">
+      <created>1566972146710</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1566972146710</updated>
+    </task>
+    <task id="LOCAL-00010" summary="修改巡检维护表字段">
+      <created>1567126525554</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1567126525554</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="142930000" />
+    <option name="totallyTimeSpent" value="189883000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
+    <frame x="1358" y="-8" width="1456" height="916" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29297996" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -511,13 +621,14 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Thumbnails" weight="0.3295082" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.5081967" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.3849105" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
       <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
       <window_info anchor="bottom" id="Spring" order="8" />
       <window_info anchor="bottom" id="Terminal" order="9" />
@@ -539,7 +650,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2193646" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -547,22 +658,23 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.47540984" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
-      <window_info anchor="bottom" id="Spring" order="8" />
-      <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
-      <window_info anchor="bottom" id="Statistic" order="11" />
-      <window_info anchor="bottom" id="Java Enterprise" order="12" />
-      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="14" weight="0.32786885" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.52307695" />
+      <window_info anchor="bottom" id="Thumbnails" order="0" weight="0.3295082" />
+      <window_info anchor="bottom" id="Message" order="1" />
+      <window_info anchor="bottom" id="Find" order="2" />
+      <window_info anchor="bottom" id="Run" order="3" />
+      <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.49924356" weight="0.49344262" />
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Application Servers" order="8" weight="0.3276923" />
+      <window_info anchor="bottom" id="Spring" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
+      <window_info anchor="bottom" id="Statistic" order="12" />
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <window_info anchor="bottom" id="Database Changes" order="14" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="15" weight="0.32786885" />
+      <window_info anchor="bottom" id="Messages" order="16" weight="0.5229508" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -578,6 +690,16 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -587,7 +709,11 @@
     <MESSAGE value="修改权限问题" />
     <MESSAGE value="修改人员登录返回接口" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整理管线部分" />
+    <MESSAGE value="合并代码提交" />
+    <MESSAGE value="修改报警阈值" />
+    <MESSAGE value="修改巡检维护表字段" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护表字段" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -602,322 +728,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-532">
-          <caret line="50" column="28" lean-forward="true" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="19" column="60" selection-start-line="19" selection-start-column="60" selection-end-line="19" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="100" column="34" lean-forward="true" selection-start-line="100" selection-start-column="34" selection-end-line="100" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1474">
-          <caret line="84" column="58" selection-start-line="84" selection-start-column="58" selection-end-line="84" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1100">
-          <caret line="58" column="18" selection-start-line="58" selection-start-column="18" selection-end-line="58" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6842">
-          <caret line="329" selection-start-line="329" selection-end-line="329" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="102" column="24" lean-forward="true" selection-start-line="102" selection-start-column="24" selection-end-line="102" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="72" column="56" lean-forward="true" selection-start-line="72" selection-start-column="56" selection-end-line="72" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="90" column="39" lean-forward="true" selection-start-line="90" selection-start-column="39" selection-end-line="90" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="97" column="16" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
-          <caret line="14" column="52" lean-forward="true" selection-start-line="14" selection-start-column="52" selection-end-line="14" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="26" column="34" lean-forward="true" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="61" column="1" lean-forward="true" selection-start-line="61" selection-start-column="1" selection-end-line="61" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="208" column="49" lean-forward="true" selection-start-line="208" selection-start-column="49" selection-end-line="208" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="140" column="57" selection-start-line="140" selection-start-column="57" selection-end-line="140" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="111" column="36" selection-start-line="111" selection-start-column="36" selection-end-line="111" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="3" lean-forward="true" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="81" column="58" lean-forward="true" selection-start-line="81" selection-start-column="58" selection-end-line="81" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="472">
-          <caret line="118" column="59" selection-start-line="118" selection-start-column="59" selection-end-line="118" selection-end-column="59" />
-          <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-198">
-          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="69" column="32" lean-forward="true" selection-start-line="69" selection-start-column="32" selection-end-line="70" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="142" column="59" lean-forward="true" selection-start-line="142" selection-start-column="59" selection-end-line="142" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="349" column="9" lean-forward="true" selection-start-line="349" selection-start-column="9" selection-end-line="349" selection-end-column="9" />
-          <folding>
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="e#12105#12121#0" expanded="true" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-686">
-          <caret line="67" column="31" lean-forward="true" selection-start-line="67" selection-start-column="31" selection-end-line="67" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="93" column="24" lean-forward="true" selection-start-line="93" selection-start-column="24" selection-end-line="93" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="57" column="23" lean-forward="true" selection-start-line="57" selection-start-column="23" selection-end-line="57" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-408">
-          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="98" column="40" lean-forward="true" selection-start-line="98" selection-start-column="40" selection-end-line="98" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="572">
@@ -925,13 +735,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="328" column="32" lean-forward="true" selection-start-line="328" selection-start-column="32" selection-end-line="328" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
@@ -950,16 +753,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="396">
           <caret line="23" column="32" lean-forward="true" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
-          <folding>
-            <element signature="e#2635#2636#0" expanded="true" />
-            <element signature="e#2671#2672#0" expanded="true" />
-            <element signature="e#2727#2728#0" expanded="true" />
-            <element signature="e#2777#2778#0" expanded="true" />
-            <element signature="e#2877#2878#0" expanded="true" />
-            <element signature="e#2911#2912#0" expanded="true" />
-            <element signature="e#2963#2964#0" expanded="true" />
-            <element signature="e#3009#3010#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -972,14 +765,481 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+        <state relative-caret-position="66">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="59" column="46" lean-forward="true" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3586">
+          <caret line="179" column="16" selection-start-line="179" selection-start-column="16" selection-end-line="179" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5478">
+          <caret line="273" column="3" selection-start-line="273" selection-start-column="3" selection-end-line="273" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1870">
+          <caret line="147" column="11" selection-start-line="147" selection-start-column="11" selection-end-line="147" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="55" column="15" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="106">
+          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="290" column="41" lean-forward="true" selection-start-line="290" selection-start-column="41" selection-end-line="290" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="21" column="32" lean-forward="true" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="550">
+          <caret line="38" column="89" selection-start-line="38" selection-start-column="89" selection-end-line="38" selection-end-column="89" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="11" column="28" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1166">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="818">
+          <caret line="285" column="13" lean-forward="true" selection-start-line="285" selection-start-column="13" selection-end-line="285" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="129" column="31" lean-forward="true" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="323" column="72" lean-forward="true" selection-start-line="323" selection-start-column="72" selection-end-line="323" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="44" column="13" lean-forward="true" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-638">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="244">
+          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="157">
+          <caret line="16" column="55" lean-forward="true" selection-start-line="16" selection-start-column="55" selection-end-line="16" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="270" column="33" lean-forward="true" selection-start-line="270" selection-start-column="33" selection-end-line="270" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="490">
+          <caret line="141" selection-start-line="141" selection-end-line="141" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="164" column="5" lean-forward="true" selection-start-line="164" selection-start-column="5" selection-end-line="164" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/apiTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-242">
+          <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="61" column="16" lean-forward="true" selection-start-line="61" selection-start-column="16" selection-end-line="61" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="700">
+          <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="12" column="34" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="39" column="9" lean-forward="true" selection-start-line="39" selection-start-column="9" selection-end-line="39" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="32" column="29" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="29" />
           <folding>
-            <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-            <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#1838#1839#0" expanded="true" />
+            <element signature="e#1863#1864#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1925#1926#0" expanded="true" />
+            <element signature="e#1822#1823#0" expanded="true" />
+            <element signature="e#1851#1852#0" expanded="true" />
+            <element signature="e#1895#1896#0" expanded="true" />
+            <element signature="e#1931#1932#0" expanded="true" />
+            <element signature="e#2132#2133#0" expanded="true" />
+            <element signature="e#2164#2165#0" expanded="true" />
+            <element signature="e#2214#2215#0" expanded="true" />
+            <element signature="e#2256#2257#0" expanded="true" />
+            <element signature="e#2330#2331#0" expanded="true" />
+            <element signature="e#2370#2371#0" expanded="true" />
+            <element signature="e#2436#2437#0" expanded="true" />
+            <element signature="e#2494#2495#0" expanded="true" />
+            <element signature="e#2569#2570#0" expanded="true" />
+            <element signature="e#2602#2603#0" expanded="true" />
+            <element signature="e#2654#2655#0" expanded="true" />
+            <element signature="e#2698#2699#0" expanded="true" />
+            <element signature="e#2764#2765#0" expanded="true" />
+            <element signature="e#2795#2796#0" expanded="true" />
+            <element signature="e#2843#2844#0" expanded="true" />
+            <element signature="e#2883#2884#0" expanded="true" />
+            <element signature="e#2948#2949#0" expanded="true" />
+            <element signature="e#2980#2981#0" expanded="true" />
+            <element signature="e#3030#3031#0" expanded="true" />
+            <element signature="e#3072#3073#0" expanded="true" />
+            <element signature="e#3134#3135#0" expanded="true" />
+            <element signature="e#3162#3163#0" expanded="true" />
+            <element signature="e#3204#3205#0" expanded="true" />
+            <element signature="e#3238#3239#0" expanded="true" />
+            <element signature="e#3307#3308#0" expanded="true" />
+            <element signature="e#3346#3347#0" expanded="true" />
+            <element signature="e#3410#3411#0" expanded="true" />
+            <element signature="e#3466#3467#0" expanded="true" />
+            <element signature="e#3537#3538#0" expanded="true" />
+            <element signature="e#3567#3568#0" expanded="true" />
+            <element signature="e#3613#3614#0" expanded="true" />
+            <element signature="e#3651#3652#0" expanded="true" />
+            <element signature="e#3721#3722#0" expanded="true" />
+            <element signature="e#3759#3760#0" expanded="true" />
+            <element signature="e#3821#3822#0" expanded="true" />
+            <element signature="e#3875#3876#0" expanded="true" />
+            <element signature="e#3953#3954#0" expanded="true" />
+            <element signature="e#3991#3992#0" expanded="true" />
+            <element signature="e#4053#4054#0" expanded="true" />
+            <element signature="e#4107#4108#0" expanded="true" />
+            <element signature="e#4186#4187#0" expanded="true" />
+            <element signature="e#4225#4226#0" expanded="true" />
+            <element signature="e#4289#4290#0" expanded="true" />
+            <element signature="e#4345#4346#0" expanded="true" />
+            <element signature="e#4430#4431#0" expanded="true" />
+            <element signature="e#4474#4475#0" expanded="true" />
+            <element signature="e#4698#4699#0" expanded="true" />
+            <element signature="e#4740#4741#0" expanded="true" />
+            <element signature="e#4810#4811#0" expanded="true" />
+            <element signature="e#4872#4873#0" expanded="true" />
+            <element signature="e#4955#4956#0" expanded="true" />
+            <element signature="e#4994#4995#0" expanded="true" />
+            <element signature="e#5058#5059#0" expanded="true" />
+            <element signature="e#5114#5115#0" expanded="true" />
+            <element signature="e#5194#5195#0" expanded="true" />
+            <element signature="e#5233#5234#0" expanded="true" />
+            <element signature="e#5297#5298#0" expanded="true" />
+            <element signature="e#5353#5354#0" expanded="true" />
+            <element signature="e#5428#5429#0" expanded="true" />
+            <element signature="e#5462#5463#0" expanded="true" />
+            <element signature="e#5516#5517#0" expanded="true" />
+            <element signature="e#5562#5563#0" expanded="true" />
+            <element signature="e#5634#5635#0" expanded="true" />
+            <element signature="e#5670#5671#0" expanded="true" />
+            <element signature="e#5728#5729#0" expanded="true" />
+            <element signature="e#5778#5779#0" expanded="true" />
+            <element signature="e#5852#5853#0" expanded="true" />
+            <element signature="e#5888#5889#0" expanded="true" />
+            <element signature="e#5946#5947#0" expanded="true" />
+            <element signature="e#5996#5997#0" expanded="true" />
+            <element signature="e#6067#6068#0" expanded="true" />
+            <element signature="e#6100#6101#0" expanded="true" />
+            <element signature="e#6152#6153#0" expanded="true" />
+            <element signature="e#6196#6197#0" expanded="true" />
+            <element signature="e#6261#6262#0" expanded="true" />
+            <element signature="e#6291#6292#0" expanded="true" />
+            <element signature="e#6337#6338#0" expanded="true" />
+            <element signature="e#6375#6376#0" expanded="true" />
+            <element signature="e#6437#6438#0" expanded="true" />
+            <element signature="e#6467#6468#0" expanded="true" />
+            <element signature="e#6513#6514#0" expanded="true" />
+            <element signature="e#6551#6552#0" expanded="true" />
+            <element signature="e#6613#6614#0" expanded="true" />
+            <element signature="e#6643#6644#0" expanded="true" />
+            <element signature="e#6689#6690#0" expanded="true" />
+            <element signature="e#6727#6728#0" expanded="true" />
+            <element signature="e#6796#6797#0" expanded="true" />
+            <element signature="e#6829#6830#0" expanded="true" />
+            <element signature="e#6881#6882#0" expanded="true" />
+            <element signature="e#6925#6926#0" expanded="true" />
+            <element signature="e#6995#6996#0" expanded="true" />
+            <element signature="e#7030#7031#0" expanded="true" />
+            <element signature="e#7086#7087#0" expanded="true" />
+            <element signature="e#7134#7135#0" expanded="true" />
+            <element signature="e#7202#7203#0" expanded="true" />
+            <element signature="e#7233#7234#0" expanded="true" />
+            <element signature="e#7281#7282#0" expanded="true" />
+            <element signature="e#7321#7322#0" expanded="true" />
+            <element signature="e#7390#7391#0" expanded="true" />
+            <element signature="e#7426#7427#0" expanded="true" />
+            <element signature="e#7484#7485#0" expanded="true" />
+            <element signature="e#7534#7535#0" expanded="true" />
+            <element signature="e#7602#7603#0" expanded="true" />
+            <element signature="e#7636#7637#0" expanded="true" />
+            <element signature="e#7690#7691#0" expanded="true" />
+            <element signature="e#7736#7737#0" expanded="true" />
+            <element signature="e#7806#7807#0" expanded="true" />
+            <element signature="e#7840#7841#0" expanded="true" />
+            <element signature="e#7894#7895#0" expanded="true" />
+            <element signature="e#7940#7941#0" expanded="true" />
+            <element signature="e#8006#8007#0" expanded="true" />
+            <element signature="e#8036#8037#0" expanded="true" />
+            <element signature="e#8082#8083#0" expanded="true" />
+            <element signature="e#8120#8121#0" expanded="true" />
+            <element signature="e#8189#8190#0" expanded="true" />
+            <element signature="e#8226#8227#0" expanded="true" />
+            <element signature="e#8286#8287#0" expanded="true" />
+            <element signature="e#8338#8339#0" expanded="true" />
+            <element signature="e#8417#8418#0" expanded="true" />
+            <element signature="e#8457#8458#0" expanded="true" />
+            <element signature="e#8523#8524#0" expanded="true" />
+            <element signature="e#8581#8582#0" expanded="true" />
+            <element signature="e#8655#8656#0" expanded="true" />
+            <element signature="e#8687#8688#0" expanded="true" />
+            <element signature="e#8737#8738#0" expanded="true" />
+            <element signature="e#8779#8780#0" expanded="true" />
+            <element signature="e#8846#8847#0" expanded="true" />
+            <element signature="e#8879#8880#0" expanded="true" />
+            <element signature="e#8931#8932#0" expanded="true" />
+            <element signature="e#8975#8976#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#787#788#0" expanded="true" />
+            <element signature="e#817#818#0" expanded="true" />
+            <element signature="e#2105#2106#0" expanded="true" />
+            <element signature="e#2135#2136#0" expanded="true" />
+            <element signature="e#2431#2432#0" expanded="true" />
+            <element signature="e#2461#2462#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index 854f1f1..0db633a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -165,12 +165,16 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String startDay,String endDay) {
+    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew) {
         try {
 
             Criteria criteria = createCriteria(PgAlarm.class);
             criteria.addOrder(Order.desc("id"));
 
+            if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) {
+                criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
+            }
+
             if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay))
             {
                 criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay)));
@@ -193,9 +197,11 @@
 
                 criteria.add(Restrictions.le("alarmDate",date));
             }
+            if(StringUtils.isNotBlank(isNew)&&isNew.equals("true"))
+                criteria.add(Restrictions.eq("active", 1));
 
             List<PgAlarm> pgAlarmList = criteria.list();
-            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
     }
 
     //根据设备位置(仓位)获取摄像机列表
-    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+    public List<PgDeviceDto> getPgCameraListByPosition(String partition,String position){
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.like("position",position+"%"));
-//        criteria.add(Restrictions.eq("devType","球机"));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(position))
+            criteria.add(Restrictions.like("position",position+"%"));
+
         criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
 
         List<PgDevice> pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
             dto.setDevCode(objects[5].toString());
             dto.setDevType(objects[6].toString());
             if(objects[7]!=null)
-            dto.setIp(objects[7].toString());
+                dto.setIp(objects[7].toString());
             dto.setIsOpen(objects[8].toString());
             dto.setPartition(objects[11].toString());
             dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index 8ebf74d..3c657a7 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgEquipment;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
 import com.casic.PgInterface.devTable.dto.PgEquipmentDto;
@@ -34,9 +35,12 @@
     public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
-        criteria.add(Restrictions.eq("eqName",eqName));
-        criteria.add(Restrictions.eq("eqCode",eqCode));
-        criteria.add(Restrictions.eq("eqType",eqType));
+        if(StringUtils.isNotBlank(eqName))
+            criteria.add(Restrictions.eq("eqName",eqName));
+        if(StringUtils.isNotBlank(eqCode))
+            criteria.add(Restrictions.eq("eqCode",eqCode));
+        if(StringUtils.isNotBlank(eqType))
+            criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
@@ -51,10 +55,9 @@
 
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
-        //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
         String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
-        +eqType+"' group by equipment.EQ_NAME";
+                +eqType+"' group by equipment.EQ_NAME";
 
         List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ff69e2a..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,27 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190828.docx" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -32,72 +42,119 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="2" />
-          <entry key="java" value="243" />
-          <entry key="properties" value="6" />
+          <entry key="java" value="321" />
+          <entry key="properties" value="8" />
           <entry key="xml" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
-          <entry key="JAVA" value="243" />
-          <entry key="Properties" value="6" />
+          <entry key="JAVA" value="321" />
+          <entry key="Properties" value="8" />
           <entry key="XML" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="8082" />
-          <entry key="properties" value="49" />
-          <entry key="txt" value="64" />
+          <entry key="dummy" value="16" />
+          <entry key="java" value="10723" />
+          <entry key="properties" value="59" />
+          <entry key="txt" value="118" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="8082" />
-          <entry key="PLAIN_TEXT" value="64" />
-          <entry key="Properties" value="49" />
+          <entry key="JAVA" value="10723" />
+          <entry key="PLAIN_TEXT" value="134" />
+          <entry key="Properties" value="59" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="4" />
+          <entry key="project.closed" value="28" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
           <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.24" value="1" />
+          <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="1" />
-          <entry key="project.open.time.3" value="3" />
-          <entry key="project.open.time.31" value="1" />
+          <entry key="project.open.time.28" value="1" />
+          <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.31" value="2" />
           <entry key="project.open.time.37" value="1" />
+          <entry key="project.open.time.39" value="2" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.40" value="1" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="1" />
+          <entry key="project.open.time.44" value="2" />
           <entry key="project.open.time.45" value="2" />
           <entry key="project.open.time.48" value="1" />
           <entry key="project.open.time.49" value="1" />
+          <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.58" value="1" />
           <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.71" value="1" />
+          <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.71" value="2" />
           <entry key="project.open.time.76" value="1" />
-          <entry key="project.opened" value="25" />
+          <entry key="project.opened" value="41" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+            <state relative-caret-position="174">
+              <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
               <folding>
-                <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-                <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="352">
+              <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#787#788#0" expanded="true" />
+                <element signature="e#817#818#0" expanded="true" />
+                <element signature="e#2105#2106#0" expanded="true" />
+                <element signature="e#2135#2136#0" expanded="true" />
+                <element signature="e#2431#2432#0" expanded="true" />
+                <element signature="e#2461#2462#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="638">
+              <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+              <folding>
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -122,6 +179,7 @@
       <find>getPgDeviceByDevType</find>
       <find>message</find>
       <find>getConstructionByType</find>
+      <find>getPgCameraListByPosition</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -130,24 +188,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanTypeDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
@@ -162,17 +207,38 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
       </list>
     </option>
   </component>
@@ -208,16 +274,18 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="3" />
-    <option name="y" value="10" />
-    <option name="width" value="1386" />
-    <option name="height" value="788" />
+    <option name="x" value="1410" />
+    <option name="y" value="117" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -258,7 +326,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -267,16 +335,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -286,7 +345,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="dto" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -296,7 +355,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="manager" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -308,19 +367,10 @@
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="webapp" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -359,6 +409,7 @@
       </deployment>
       <server-settings>
         <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_7" />
+        <option name="JNDI_PORT" value="10991" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -456,7 +507,23 @@
       <workItem from="1566350810712" duration="6803000" />
       <workItem from="1566435787074" duration="10717000" />
       <workItem from="1566521753529" duration="14265000" />
-      <workItem from="1566614176989" duration="5693000" />
+      <workItem from="1566614176989" duration="14059000" />
+      <workItem from="1566780822009" duration="1026000" />
+      <workItem from="1566891563975" duration="284000" />
+      <workItem from="1566893107340" duration="3382000" />
+      <workItem from="1566953794976" duration="11039000" />
+      <workItem from="1567059357700" duration="484000" />
+      <workItem from="1567082835097" duration="1086000" />
+      <workItem from="1567126428020" duration="1539000" />
+      <workItem from="1567129277820" duration="5788000" />
+      <workItem from="1567136008996" duration="2568000" />
+      <workItem from="1567237040302" duration="111000" />
+      <workItem from="1567495626345" duration="2797000" />
+      <workItem from="1567558770152" duration="2352000" />
+      <workItem from="1567577368149" duration="640000" />
+      <workItem from="1567751224608" duration="780000" />
+      <workItem from="1568019299799" duration="695000" />
+      <workItem from="1568082566133" duration="4016000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -493,17 +560,60 @@
       <option name="project" value="LOCAL" />
       <updated>1566553388171</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="整理管线部分">
+      <created>1566620046627</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1566620046627</updated>
+    </task>
+    <task id="LOCAL-00007" summary="合并代码提交">
+      <created>1566781001910</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1566781001910</updated>
+    </task>
+    <task id="LOCAL-00008" summary="合并代码提交">
+      <created>1566963831930</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1566963831930</updated>
+    </task>
+    <task id="LOCAL-00009" summary="修改报警阈值">
+      <created>1566972146710</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1566972146710</updated>
+    </task>
+    <task id="LOCAL-00010" summary="修改巡检维护表字段">
+      <created>1567126525554</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1567126525554</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="142930000" />
+    <option name="totallyTimeSpent" value="189883000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
+    <frame x="1358" y="-8" width="1456" height="916" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29297996" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -511,13 +621,14 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Thumbnails" weight="0.3295082" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.5081967" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.3849105" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
       <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
       <window_info anchor="bottom" id="Spring" order="8" />
       <window_info anchor="bottom" id="Terminal" order="9" />
@@ -539,7 +650,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2193646" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -547,22 +658,23 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.47540984" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
-      <window_info anchor="bottom" id="Spring" order="8" />
-      <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
-      <window_info anchor="bottom" id="Statistic" order="11" />
-      <window_info anchor="bottom" id="Java Enterprise" order="12" />
-      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="14" weight="0.32786885" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.52307695" />
+      <window_info anchor="bottom" id="Thumbnails" order="0" weight="0.3295082" />
+      <window_info anchor="bottom" id="Message" order="1" />
+      <window_info anchor="bottom" id="Find" order="2" />
+      <window_info anchor="bottom" id="Run" order="3" />
+      <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.49924356" weight="0.49344262" />
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Application Servers" order="8" weight="0.3276923" />
+      <window_info anchor="bottom" id="Spring" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
+      <window_info anchor="bottom" id="Statistic" order="12" />
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <window_info anchor="bottom" id="Database Changes" order="14" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="15" weight="0.32786885" />
+      <window_info anchor="bottom" id="Messages" order="16" weight="0.5229508" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -578,6 +690,16 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -587,7 +709,11 @@
     <MESSAGE value="修改权限问题" />
     <MESSAGE value="修改人员登录返回接口" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整理管线部分" />
+    <MESSAGE value="合并代码提交" />
+    <MESSAGE value="修改报警阈值" />
+    <MESSAGE value="修改巡检维护表字段" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护表字段" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -602,322 +728,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-532">
-          <caret line="50" column="28" lean-forward="true" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="19" column="60" selection-start-line="19" selection-start-column="60" selection-end-line="19" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="100" column="34" lean-forward="true" selection-start-line="100" selection-start-column="34" selection-end-line="100" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1474">
-          <caret line="84" column="58" selection-start-line="84" selection-start-column="58" selection-end-line="84" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1100">
-          <caret line="58" column="18" selection-start-line="58" selection-start-column="18" selection-end-line="58" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6842">
-          <caret line="329" selection-start-line="329" selection-end-line="329" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="102" column="24" lean-forward="true" selection-start-line="102" selection-start-column="24" selection-end-line="102" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="72" column="56" lean-forward="true" selection-start-line="72" selection-start-column="56" selection-end-line="72" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="90" column="39" lean-forward="true" selection-start-line="90" selection-start-column="39" selection-end-line="90" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="97" column="16" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
-          <caret line="14" column="52" lean-forward="true" selection-start-line="14" selection-start-column="52" selection-end-line="14" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="26" column="34" lean-forward="true" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="61" column="1" lean-forward="true" selection-start-line="61" selection-start-column="1" selection-end-line="61" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="208" column="49" lean-forward="true" selection-start-line="208" selection-start-column="49" selection-end-line="208" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="140" column="57" selection-start-line="140" selection-start-column="57" selection-end-line="140" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="111" column="36" selection-start-line="111" selection-start-column="36" selection-end-line="111" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="3" lean-forward="true" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="81" column="58" lean-forward="true" selection-start-line="81" selection-start-column="58" selection-end-line="81" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="472">
-          <caret line="118" column="59" selection-start-line="118" selection-start-column="59" selection-end-line="118" selection-end-column="59" />
-          <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-198">
-          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="69" column="32" lean-forward="true" selection-start-line="69" selection-start-column="32" selection-end-line="70" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="142" column="59" lean-forward="true" selection-start-line="142" selection-start-column="59" selection-end-line="142" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="349" column="9" lean-forward="true" selection-start-line="349" selection-start-column="9" selection-end-line="349" selection-end-column="9" />
-          <folding>
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="e#12105#12121#0" expanded="true" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-686">
-          <caret line="67" column="31" lean-forward="true" selection-start-line="67" selection-start-column="31" selection-end-line="67" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="93" column="24" lean-forward="true" selection-start-line="93" selection-start-column="24" selection-end-line="93" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="57" column="23" lean-forward="true" selection-start-line="57" selection-start-column="23" selection-end-line="57" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-408">
-          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="98" column="40" lean-forward="true" selection-start-line="98" selection-start-column="40" selection-end-line="98" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="572">
@@ -925,13 +735,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="328" column="32" lean-forward="true" selection-start-line="328" selection-start-column="32" selection-end-line="328" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
@@ -950,16 +753,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="396">
           <caret line="23" column="32" lean-forward="true" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
-          <folding>
-            <element signature="e#2635#2636#0" expanded="true" />
-            <element signature="e#2671#2672#0" expanded="true" />
-            <element signature="e#2727#2728#0" expanded="true" />
-            <element signature="e#2777#2778#0" expanded="true" />
-            <element signature="e#2877#2878#0" expanded="true" />
-            <element signature="e#2911#2912#0" expanded="true" />
-            <element signature="e#2963#2964#0" expanded="true" />
-            <element signature="e#3009#3010#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -972,14 +765,481 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+        <state relative-caret-position="66">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="59" column="46" lean-forward="true" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3586">
+          <caret line="179" column="16" selection-start-line="179" selection-start-column="16" selection-end-line="179" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5478">
+          <caret line="273" column="3" selection-start-line="273" selection-start-column="3" selection-end-line="273" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1870">
+          <caret line="147" column="11" selection-start-line="147" selection-start-column="11" selection-end-line="147" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="55" column="15" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="106">
+          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="290" column="41" lean-forward="true" selection-start-line="290" selection-start-column="41" selection-end-line="290" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="21" column="32" lean-forward="true" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="550">
+          <caret line="38" column="89" selection-start-line="38" selection-start-column="89" selection-end-line="38" selection-end-column="89" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="11" column="28" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1166">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="818">
+          <caret line="285" column="13" lean-forward="true" selection-start-line="285" selection-start-column="13" selection-end-line="285" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="129" column="31" lean-forward="true" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="323" column="72" lean-forward="true" selection-start-line="323" selection-start-column="72" selection-end-line="323" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="44" column="13" lean-forward="true" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-638">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="244">
+          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="157">
+          <caret line="16" column="55" lean-forward="true" selection-start-line="16" selection-start-column="55" selection-end-line="16" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="270" column="33" lean-forward="true" selection-start-line="270" selection-start-column="33" selection-end-line="270" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="490">
+          <caret line="141" selection-start-line="141" selection-end-line="141" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="164" column="5" lean-forward="true" selection-start-line="164" selection-start-column="5" selection-end-line="164" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/apiTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-242">
+          <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="61" column="16" lean-forward="true" selection-start-line="61" selection-start-column="16" selection-end-line="61" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="700">
+          <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="12" column="34" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="39" column="9" lean-forward="true" selection-start-line="39" selection-start-column="9" selection-end-line="39" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="32" column="29" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="29" />
           <folding>
-            <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-            <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#1838#1839#0" expanded="true" />
+            <element signature="e#1863#1864#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1925#1926#0" expanded="true" />
+            <element signature="e#1822#1823#0" expanded="true" />
+            <element signature="e#1851#1852#0" expanded="true" />
+            <element signature="e#1895#1896#0" expanded="true" />
+            <element signature="e#1931#1932#0" expanded="true" />
+            <element signature="e#2132#2133#0" expanded="true" />
+            <element signature="e#2164#2165#0" expanded="true" />
+            <element signature="e#2214#2215#0" expanded="true" />
+            <element signature="e#2256#2257#0" expanded="true" />
+            <element signature="e#2330#2331#0" expanded="true" />
+            <element signature="e#2370#2371#0" expanded="true" />
+            <element signature="e#2436#2437#0" expanded="true" />
+            <element signature="e#2494#2495#0" expanded="true" />
+            <element signature="e#2569#2570#0" expanded="true" />
+            <element signature="e#2602#2603#0" expanded="true" />
+            <element signature="e#2654#2655#0" expanded="true" />
+            <element signature="e#2698#2699#0" expanded="true" />
+            <element signature="e#2764#2765#0" expanded="true" />
+            <element signature="e#2795#2796#0" expanded="true" />
+            <element signature="e#2843#2844#0" expanded="true" />
+            <element signature="e#2883#2884#0" expanded="true" />
+            <element signature="e#2948#2949#0" expanded="true" />
+            <element signature="e#2980#2981#0" expanded="true" />
+            <element signature="e#3030#3031#0" expanded="true" />
+            <element signature="e#3072#3073#0" expanded="true" />
+            <element signature="e#3134#3135#0" expanded="true" />
+            <element signature="e#3162#3163#0" expanded="true" />
+            <element signature="e#3204#3205#0" expanded="true" />
+            <element signature="e#3238#3239#0" expanded="true" />
+            <element signature="e#3307#3308#0" expanded="true" />
+            <element signature="e#3346#3347#0" expanded="true" />
+            <element signature="e#3410#3411#0" expanded="true" />
+            <element signature="e#3466#3467#0" expanded="true" />
+            <element signature="e#3537#3538#0" expanded="true" />
+            <element signature="e#3567#3568#0" expanded="true" />
+            <element signature="e#3613#3614#0" expanded="true" />
+            <element signature="e#3651#3652#0" expanded="true" />
+            <element signature="e#3721#3722#0" expanded="true" />
+            <element signature="e#3759#3760#0" expanded="true" />
+            <element signature="e#3821#3822#0" expanded="true" />
+            <element signature="e#3875#3876#0" expanded="true" />
+            <element signature="e#3953#3954#0" expanded="true" />
+            <element signature="e#3991#3992#0" expanded="true" />
+            <element signature="e#4053#4054#0" expanded="true" />
+            <element signature="e#4107#4108#0" expanded="true" />
+            <element signature="e#4186#4187#0" expanded="true" />
+            <element signature="e#4225#4226#0" expanded="true" />
+            <element signature="e#4289#4290#0" expanded="true" />
+            <element signature="e#4345#4346#0" expanded="true" />
+            <element signature="e#4430#4431#0" expanded="true" />
+            <element signature="e#4474#4475#0" expanded="true" />
+            <element signature="e#4698#4699#0" expanded="true" />
+            <element signature="e#4740#4741#0" expanded="true" />
+            <element signature="e#4810#4811#0" expanded="true" />
+            <element signature="e#4872#4873#0" expanded="true" />
+            <element signature="e#4955#4956#0" expanded="true" />
+            <element signature="e#4994#4995#0" expanded="true" />
+            <element signature="e#5058#5059#0" expanded="true" />
+            <element signature="e#5114#5115#0" expanded="true" />
+            <element signature="e#5194#5195#0" expanded="true" />
+            <element signature="e#5233#5234#0" expanded="true" />
+            <element signature="e#5297#5298#0" expanded="true" />
+            <element signature="e#5353#5354#0" expanded="true" />
+            <element signature="e#5428#5429#0" expanded="true" />
+            <element signature="e#5462#5463#0" expanded="true" />
+            <element signature="e#5516#5517#0" expanded="true" />
+            <element signature="e#5562#5563#0" expanded="true" />
+            <element signature="e#5634#5635#0" expanded="true" />
+            <element signature="e#5670#5671#0" expanded="true" />
+            <element signature="e#5728#5729#0" expanded="true" />
+            <element signature="e#5778#5779#0" expanded="true" />
+            <element signature="e#5852#5853#0" expanded="true" />
+            <element signature="e#5888#5889#0" expanded="true" />
+            <element signature="e#5946#5947#0" expanded="true" />
+            <element signature="e#5996#5997#0" expanded="true" />
+            <element signature="e#6067#6068#0" expanded="true" />
+            <element signature="e#6100#6101#0" expanded="true" />
+            <element signature="e#6152#6153#0" expanded="true" />
+            <element signature="e#6196#6197#0" expanded="true" />
+            <element signature="e#6261#6262#0" expanded="true" />
+            <element signature="e#6291#6292#0" expanded="true" />
+            <element signature="e#6337#6338#0" expanded="true" />
+            <element signature="e#6375#6376#0" expanded="true" />
+            <element signature="e#6437#6438#0" expanded="true" />
+            <element signature="e#6467#6468#0" expanded="true" />
+            <element signature="e#6513#6514#0" expanded="true" />
+            <element signature="e#6551#6552#0" expanded="true" />
+            <element signature="e#6613#6614#0" expanded="true" />
+            <element signature="e#6643#6644#0" expanded="true" />
+            <element signature="e#6689#6690#0" expanded="true" />
+            <element signature="e#6727#6728#0" expanded="true" />
+            <element signature="e#6796#6797#0" expanded="true" />
+            <element signature="e#6829#6830#0" expanded="true" />
+            <element signature="e#6881#6882#0" expanded="true" />
+            <element signature="e#6925#6926#0" expanded="true" />
+            <element signature="e#6995#6996#0" expanded="true" />
+            <element signature="e#7030#7031#0" expanded="true" />
+            <element signature="e#7086#7087#0" expanded="true" />
+            <element signature="e#7134#7135#0" expanded="true" />
+            <element signature="e#7202#7203#0" expanded="true" />
+            <element signature="e#7233#7234#0" expanded="true" />
+            <element signature="e#7281#7282#0" expanded="true" />
+            <element signature="e#7321#7322#0" expanded="true" />
+            <element signature="e#7390#7391#0" expanded="true" />
+            <element signature="e#7426#7427#0" expanded="true" />
+            <element signature="e#7484#7485#0" expanded="true" />
+            <element signature="e#7534#7535#0" expanded="true" />
+            <element signature="e#7602#7603#0" expanded="true" />
+            <element signature="e#7636#7637#0" expanded="true" />
+            <element signature="e#7690#7691#0" expanded="true" />
+            <element signature="e#7736#7737#0" expanded="true" />
+            <element signature="e#7806#7807#0" expanded="true" />
+            <element signature="e#7840#7841#0" expanded="true" />
+            <element signature="e#7894#7895#0" expanded="true" />
+            <element signature="e#7940#7941#0" expanded="true" />
+            <element signature="e#8006#8007#0" expanded="true" />
+            <element signature="e#8036#8037#0" expanded="true" />
+            <element signature="e#8082#8083#0" expanded="true" />
+            <element signature="e#8120#8121#0" expanded="true" />
+            <element signature="e#8189#8190#0" expanded="true" />
+            <element signature="e#8226#8227#0" expanded="true" />
+            <element signature="e#8286#8287#0" expanded="true" />
+            <element signature="e#8338#8339#0" expanded="true" />
+            <element signature="e#8417#8418#0" expanded="true" />
+            <element signature="e#8457#8458#0" expanded="true" />
+            <element signature="e#8523#8524#0" expanded="true" />
+            <element signature="e#8581#8582#0" expanded="true" />
+            <element signature="e#8655#8656#0" expanded="true" />
+            <element signature="e#8687#8688#0" expanded="true" />
+            <element signature="e#8737#8738#0" expanded="true" />
+            <element signature="e#8779#8780#0" expanded="true" />
+            <element signature="e#8846#8847#0" expanded="true" />
+            <element signature="e#8879#8880#0" expanded="true" />
+            <element signature="e#8931#8932#0" expanded="true" />
+            <element signature="e#8975#8976#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#787#788#0" expanded="true" />
+            <element signature="e#817#818#0" expanded="true" />
+            <element signature="e#2105#2106#0" expanded="true" />
+            <element signature="e#2135#2136#0" expanded="true" />
+            <element signature="e#2431#2432#0" expanded="true" />
+            <element signature="e#2461#2462#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index 854f1f1..0db633a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -165,12 +165,16 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String startDay,String endDay) {
+    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew) {
         try {
 
             Criteria criteria = createCriteria(PgAlarm.class);
             criteria.addOrder(Order.desc("id"));
 
+            if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) {
+                criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
+            }
+
             if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay))
             {
                 criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay)));
@@ -193,9 +197,11 @@
 
                 criteria.add(Restrictions.le("alarmDate",date));
             }
+            if(StringUtils.isNotBlank(isNew)&&isNew.equals("true"))
+                criteria.add(Restrictions.eq("active", 1));
 
             List<PgAlarm> pgAlarmList = criteria.list();
-            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
     }
 
     //根据设备位置(仓位)获取摄像机列表
-    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+    public List<PgDeviceDto> getPgCameraListByPosition(String partition,String position){
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.like("position",position+"%"));
-//        criteria.add(Restrictions.eq("devType","球机"));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(position))
+            criteria.add(Restrictions.like("position",position+"%"));
+
         criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
 
         List<PgDevice> pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
             dto.setDevCode(objects[5].toString());
             dto.setDevType(objects[6].toString());
             if(objects[7]!=null)
-            dto.setIp(objects[7].toString());
+                dto.setIp(objects[7].toString());
             dto.setIsOpen(objects[8].toString());
             dto.setPartition(objects[11].toString());
             dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index 8ebf74d..3c657a7 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgEquipment;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
 import com.casic.PgInterface.devTable.dto.PgEquipmentDto;
@@ -34,9 +35,12 @@
     public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
-        criteria.add(Restrictions.eq("eqName",eqName));
-        criteria.add(Restrictions.eq("eqCode",eqCode));
-        criteria.add(Restrictions.eq("eqType",eqType));
+        if(StringUtils.isNotBlank(eqName))
+            criteria.add(Restrictions.eq("eqName",eqName));
+        if(StringUtils.isNotBlank(eqCode))
+            criteria.add(Restrictions.eq("eqCode",eqCode));
+        if(StringUtils.isNotBlank(eqType))
+            criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
@@ -51,10 +55,9 @@
 
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
-        //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
         String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
-        +eqType+"' group by equipment.EQ_NAME";
+                +eqType+"' group by equipment.EQ_NAME";
 
         List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4ed68e4..e413a5c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
@@ -39,7 +40,8 @@
 
     public List<PgPipeLineDto> getPipeLineByLineType(String lineType) {
         Criteria criteria = createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineType", lineType));
+        if(StringUtils.isNotBlank(lineType))
+            criteria.add(Restrictions.eq("lineType", lineType));
 
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ff69e2a..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,27 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190828.docx" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -32,72 +42,119 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="2" />
-          <entry key="java" value="243" />
-          <entry key="properties" value="6" />
+          <entry key="java" value="321" />
+          <entry key="properties" value="8" />
           <entry key="xml" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
-          <entry key="JAVA" value="243" />
-          <entry key="Properties" value="6" />
+          <entry key="JAVA" value="321" />
+          <entry key="Properties" value="8" />
           <entry key="XML" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="8082" />
-          <entry key="properties" value="49" />
-          <entry key="txt" value="64" />
+          <entry key="dummy" value="16" />
+          <entry key="java" value="10723" />
+          <entry key="properties" value="59" />
+          <entry key="txt" value="118" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="8082" />
-          <entry key="PLAIN_TEXT" value="64" />
-          <entry key="Properties" value="49" />
+          <entry key="JAVA" value="10723" />
+          <entry key="PLAIN_TEXT" value="134" />
+          <entry key="Properties" value="59" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="4" />
+          <entry key="project.closed" value="28" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
           <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.24" value="1" />
+          <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="1" />
-          <entry key="project.open.time.3" value="3" />
-          <entry key="project.open.time.31" value="1" />
+          <entry key="project.open.time.28" value="1" />
+          <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.31" value="2" />
           <entry key="project.open.time.37" value="1" />
+          <entry key="project.open.time.39" value="2" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.40" value="1" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="1" />
+          <entry key="project.open.time.44" value="2" />
           <entry key="project.open.time.45" value="2" />
           <entry key="project.open.time.48" value="1" />
           <entry key="project.open.time.49" value="1" />
+          <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.58" value="1" />
           <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.71" value="1" />
+          <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.71" value="2" />
           <entry key="project.open.time.76" value="1" />
-          <entry key="project.opened" value="25" />
+          <entry key="project.opened" value="41" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+            <state relative-caret-position="174">
+              <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
               <folding>
-                <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-                <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="352">
+              <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#787#788#0" expanded="true" />
+                <element signature="e#817#818#0" expanded="true" />
+                <element signature="e#2105#2106#0" expanded="true" />
+                <element signature="e#2135#2136#0" expanded="true" />
+                <element signature="e#2431#2432#0" expanded="true" />
+                <element signature="e#2461#2462#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="638">
+              <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+              <folding>
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -122,6 +179,7 @@
       <find>getPgDeviceByDevType</find>
       <find>message</find>
       <find>getConstructionByType</find>
+      <find>getPgCameraListByPosition</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -130,24 +188,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanTypeDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
@@ -162,17 +207,38 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
       </list>
     </option>
   </component>
@@ -208,16 +274,18 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="3" />
-    <option name="y" value="10" />
-    <option name="width" value="1386" />
-    <option name="height" value="788" />
+    <option name="x" value="1410" />
+    <option name="y" value="117" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -258,7 +326,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -267,16 +335,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -286,7 +345,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="dto" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -296,7 +355,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="manager" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -308,19 +367,10 @@
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="webapp" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -359,6 +409,7 @@
       </deployment>
       <server-settings>
         <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_7" />
+        <option name="JNDI_PORT" value="10991" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -456,7 +507,23 @@
       <workItem from="1566350810712" duration="6803000" />
       <workItem from="1566435787074" duration="10717000" />
       <workItem from="1566521753529" duration="14265000" />
-      <workItem from="1566614176989" duration="5693000" />
+      <workItem from="1566614176989" duration="14059000" />
+      <workItem from="1566780822009" duration="1026000" />
+      <workItem from="1566891563975" duration="284000" />
+      <workItem from="1566893107340" duration="3382000" />
+      <workItem from="1566953794976" duration="11039000" />
+      <workItem from="1567059357700" duration="484000" />
+      <workItem from="1567082835097" duration="1086000" />
+      <workItem from="1567126428020" duration="1539000" />
+      <workItem from="1567129277820" duration="5788000" />
+      <workItem from="1567136008996" duration="2568000" />
+      <workItem from="1567237040302" duration="111000" />
+      <workItem from="1567495626345" duration="2797000" />
+      <workItem from="1567558770152" duration="2352000" />
+      <workItem from="1567577368149" duration="640000" />
+      <workItem from="1567751224608" duration="780000" />
+      <workItem from="1568019299799" duration="695000" />
+      <workItem from="1568082566133" duration="4016000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -493,17 +560,60 @@
       <option name="project" value="LOCAL" />
       <updated>1566553388171</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="整理管线部分">
+      <created>1566620046627</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1566620046627</updated>
+    </task>
+    <task id="LOCAL-00007" summary="合并代码提交">
+      <created>1566781001910</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1566781001910</updated>
+    </task>
+    <task id="LOCAL-00008" summary="合并代码提交">
+      <created>1566963831930</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1566963831930</updated>
+    </task>
+    <task id="LOCAL-00009" summary="修改报警阈值">
+      <created>1566972146710</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1566972146710</updated>
+    </task>
+    <task id="LOCAL-00010" summary="修改巡检维护表字段">
+      <created>1567126525554</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1567126525554</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="142930000" />
+    <option name="totallyTimeSpent" value="189883000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
+    <frame x="1358" y="-8" width="1456" height="916" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29297996" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -511,13 +621,14 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Thumbnails" weight="0.3295082" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.5081967" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.3849105" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
       <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
       <window_info anchor="bottom" id="Spring" order="8" />
       <window_info anchor="bottom" id="Terminal" order="9" />
@@ -539,7 +650,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2193646" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -547,22 +658,23 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.47540984" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
-      <window_info anchor="bottom" id="Spring" order="8" />
-      <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
-      <window_info anchor="bottom" id="Statistic" order="11" />
-      <window_info anchor="bottom" id="Java Enterprise" order="12" />
-      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="14" weight="0.32786885" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.52307695" />
+      <window_info anchor="bottom" id="Thumbnails" order="0" weight="0.3295082" />
+      <window_info anchor="bottom" id="Message" order="1" />
+      <window_info anchor="bottom" id="Find" order="2" />
+      <window_info anchor="bottom" id="Run" order="3" />
+      <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.49924356" weight="0.49344262" />
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Application Servers" order="8" weight="0.3276923" />
+      <window_info anchor="bottom" id="Spring" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
+      <window_info anchor="bottom" id="Statistic" order="12" />
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <window_info anchor="bottom" id="Database Changes" order="14" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="15" weight="0.32786885" />
+      <window_info anchor="bottom" id="Messages" order="16" weight="0.5229508" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -578,6 +690,16 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -587,7 +709,11 @@
     <MESSAGE value="修改权限问题" />
     <MESSAGE value="修改人员登录返回接口" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整理管线部分" />
+    <MESSAGE value="合并代码提交" />
+    <MESSAGE value="修改报警阈值" />
+    <MESSAGE value="修改巡检维护表字段" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护表字段" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -602,322 +728,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-532">
-          <caret line="50" column="28" lean-forward="true" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="19" column="60" selection-start-line="19" selection-start-column="60" selection-end-line="19" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="100" column="34" lean-forward="true" selection-start-line="100" selection-start-column="34" selection-end-line="100" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1474">
-          <caret line="84" column="58" selection-start-line="84" selection-start-column="58" selection-end-line="84" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1100">
-          <caret line="58" column="18" selection-start-line="58" selection-start-column="18" selection-end-line="58" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6842">
-          <caret line="329" selection-start-line="329" selection-end-line="329" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="102" column="24" lean-forward="true" selection-start-line="102" selection-start-column="24" selection-end-line="102" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="72" column="56" lean-forward="true" selection-start-line="72" selection-start-column="56" selection-end-line="72" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="90" column="39" lean-forward="true" selection-start-line="90" selection-start-column="39" selection-end-line="90" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="97" column="16" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
-          <caret line="14" column="52" lean-forward="true" selection-start-line="14" selection-start-column="52" selection-end-line="14" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="26" column="34" lean-forward="true" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="61" column="1" lean-forward="true" selection-start-line="61" selection-start-column="1" selection-end-line="61" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="208" column="49" lean-forward="true" selection-start-line="208" selection-start-column="49" selection-end-line="208" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="140" column="57" selection-start-line="140" selection-start-column="57" selection-end-line="140" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="111" column="36" selection-start-line="111" selection-start-column="36" selection-end-line="111" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="3" lean-forward="true" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="81" column="58" lean-forward="true" selection-start-line="81" selection-start-column="58" selection-end-line="81" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="472">
-          <caret line="118" column="59" selection-start-line="118" selection-start-column="59" selection-end-line="118" selection-end-column="59" />
-          <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-198">
-          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="69" column="32" lean-forward="true" selection-start-line="69" selection-start-column="32" selection-end-line="70" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="142" column="59" lean-forward="true" selection-start-line="142" selection-start-column="59" selection-end-line="142" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="349" column="9" lean-forward="true" selection-start-line="349" selection-start-column="9" selection-end-line="349" selection-end-column="9" />
-          <folding>
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="e#12105#12121#0" expanded="true" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-686">
-          <caret line="67" column="31" lean-forward="true" selection-start-line="67" selection-start-column="31" selection-end-line="67" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="93" column="24" lean-forward="true" selection-start-line="93" selection-start-column="24" selection-end-line="93" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="57" column="23" lean-forward="true" selection-start-line="57" selection-start-column="23" selection-end-line="57" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-408">
-          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="98" column="40" lean-forward="true" selection-start-line="98" selection-start-column="40" selection-end-line="98" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="572">
@@ -925,13 +735,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="328" column="32" lean-forward="true" selection-start-line="328" selection-start-column="32" selection-end-line="328" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
@@ -950,16 +753,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="396">
           <caret line="23" column="32" lean-forward="true" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
-          <folding>
-            <element signature="e#2635#2636#0" expanded="true" />
-            <element signature="e#2671#2672#0" expanded="true" />
-            <element signature="e#2727#2728#0" expanded="true" />
-            <element signature="e#2777#2778#0" expanded="true" />
-            <element signature="e#2877#2878#0" expanded="true" />
-            <element signature="e#2911#2912#0" expanded="true" />
-            <element signature="e#2963#2964#0" expanded="true" />
-            <element signature="e#3009#3010#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -972,14 +765,481 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+        <state relative-caret-position="66">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="59" column="46" lean-forward="true" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3586">
+          <caret line="179" column="16" selection-start-line="179" selection-start-column="16" selection-end-line="179" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5478">
+          <caret line="273" column="3" selection-start-line="273" selection-start-column="3" selection-end-line="273" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1870">
+          <caret line="147" column="11" selection-start-line="147" selection-start-column="11" selection-end-line="147" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="55" column="15" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="106">
+          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="290" column="41" lean-forward="true" selection-start-line="290" selection-start-column="41" selection-end-line="290" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="21" column="32" lean-forward="true" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="550">
+          <caret line="38" column="89" selection-start-line="38" selection-start-column="89" selection-end-line="38" selection-end-column="89" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="11" column="28" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1166">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="818">
+          <caret line="285" column="13" lean-forward="true" selection-start-line="285" selection-start-column="13" selection-end-line="285" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="129" column="31" lean-forward="true" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="323" column="72" lean-forward="true" selection-start-line="323" selection-start-column="72" selection-end-line="323" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="44" column="13" lean-forward="true" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-638">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="244">
+          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="157">
+          <caret line="16" column="55" lean-forward="true" selection-start-line="16" selection-start-column="55" selection-end-line="16" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="270" column="33" lean-forward="true" selection-start-line="270" selection-start-column="33" selection-end-line="270" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="490">
+          <caret line="141" selection-start-line="141" selection-end-line="141" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="164" column="5" lean-forward="true" selection-start-line="164" selection-start-column="5" selection-end-line="164" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/apiTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-242">
+          <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="61" column="16" lean-forward="true" selection-start-line="61" selection-start-column="16" selection-end-line="61" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="700">
+          <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="12" column="34" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="39" column="9" lean-forward="true" selection-start-line="39" selection-start-column="9" selection-end-line="39" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="32" column="29" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="29" />
           <folding>
-            <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-            <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#1838#1839#0" expanded="true" />
+            <element signature="e#1863#1864#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1925#1926#0" expanded="true" />
+            <element signature="e#1822#1823#0" expanded="true" />
+            <element signature="e#1851#1852#0" expanded="true" />
+            <element signature="e#1895#1896#0" expanded="true" />
+            <element signature="e#1931#1932#0" expanded="true" />
+            <element signature="e#2132#2133#0" expanded="true" />
+            <element signature="e#2164#2165#0" expanded="true" />
+            <element signature="e#2214#2215#0" expanded="true" />
+            <element signature="e#2256#2257#0" expanded="true" />
+            <element signature="e#2330#2331#0" expanded="true" />
+            <element signature="e#2370#2371#0" expanded="true" />
+            <element signature="e#2436#2437#0" expanded="true" />
+            <element signature="e#2494#2495#0" expanded="true" />
+            <element signature="e#2569#2570#0" expanded="true" />
+            <element signature="e#2602#2603#0" expanded="true" />
+            <element signature="e#2654#2655#0" expanded="true" />
+            <element signature="e#2698#2699#0" expanded="true" />
+            <element signature="e#2764#2765#0" expanded="true" />
+            <element signature="e#2795#2796#0" expanded="true" />
+            <element signature="e#2843#2844#0" expanded="true" />
+            <element signature="e#2883#2884#0" expanded="true" />
+            <element signature="e#2948#2949#0" expanded="true" />
+            <element signature="e#2980#2981#0" expanded="true" />
+            <element signature="e#3030#3031#0" expanded="true" />
+            <element signature="e#3072#3073#0" expanded="true" />
+            <element signature="e#3134#3135#0" expanded="true" />
+            <element signature="e#3162#3163#0" expanded="true" />
+            <element signature="e#3204#3205#0" expanded="true" />
+            <element signature="e#3238#3239#0" expanded="true" />
+            <element signature="e#3307#3308#0" expanded="true" />
+            <element signature="e#3346#3347#0" expanded="true" />
+            <element signature="e#3410#3411#0" expanded="true" />
+            <element signature="e#3466#3467#0" expanded="true" />
+            <element signature="e#3537#3538#0" expanded="true" />
+            <element signature="e#3567#3568#0" expanded="true" />
+            <element signature="e#3613#3614#0" expanded="true" />
+            <element signature="e#3651#3652#0" expanded="true" />
+            <element signature="e#3721#3722#0" expanded="true" />
+            <element signature="e#3759#3760#0" expanded="true" />
+            <element signature="e#3821#3822#0" expanded="true" />
+            <element signature="e#3875#3876#0" expanded="true" />
+            <element signature="e#3953#3954#0" expanded="true" />
+            <element signature="e#3991#3992#0" expanded="true" />
+            <element signature="e#4053#4054#0" expanded="true" />
+            <element signature="e#4107#4108#0" expanded="true" />
+            <element signature="e#4186#4187#0" expanded="true" />
+            <element signature="e#4225#4226#0" expanded="true" />
+            <element signature="e#4289#4290#0" expanded="true" />
+            <element signature="e#4345#4346#0" expanded="true" />
+            <element signature="e#4430#4431#0" expanded="true" />
+            <element signature="e#4474#4475#0" expanded="true" />
+            <element signature="e#4698#4699#0" expanded="true" />
+            <element signature="e#4740#4741#0" expanded="true" />
+            <element signature="e#4810#4811#0" expanded="true" />
+            <element signature="e#4872#4873#0" expanded="true" />
+            <element signature="e#4955#4956#0" expanded="true" />
+            <element signature="e#4994#4995#0" expanded="true" />
+            <element signature="e#5058#5059#0" expanded="true" />
+            <element signature="e#5114#5115#0" expanded="true" />
+            <element signature="e#5194#5195#0" expanded="true" />
+            <element signature="e#5233#5234#0" expanded="true" />
+            <element signature="e#5297#5298#0" expanded="true" />
+            <element signature="e#5353#5354#0" expanded="true" />
+            <element signature="e#5428#5429#0" expanded="true" />
+            <element signature="e#5462#5463#0" expanded="true" />
+            <element signature="e#5516#5517#0" expanded="true" />
+            <element signature="e#5562#5563#0" expanded="true" />
+            <element signature="e#5634#5635#0" expanded="true" />
+            <element signature="e#5670#5671#0" expanded="true" />
+            <element signature="e#5728#5729#0" expanded="true" />
+            <element signature="e#5778#5779#0" expanded="true" />
+            <element signature="e#5852#5853#0" expanded="true" />
+            <element signature="e#5888#5889#0" expanded="true" />
+            <element signature="e#5946#5947#0" expanded="true" />
+            <element signature="e#5996#5997#0" expanded="true" />
+            <element signature="e#6067#6068#0" expanded="true" />
+            <element signature="e#6100#6101#0" expanded="true" />
+            <element signature="e#6152#6153#0" expanded="true" />
+            <element signature="e#6196#6197#0" expanded="true" />
+            <element signature="e#6261#6262#0" expanded="true" />
+            <element signature="e#6291#6292#0" expanded="true" />
+            <element signature="e#6337#6338#0" expanded="true" />
+            <element signature="e#6375#6376#0" expanded="true" />
+            <element signature="e#6437#6438#0" expanded="true" />
+            <element signature="e#6467#6468#0" expanded="true" />
+            <element signature="e#6513#6514#0" expanded="true" />
+            <element signature="e#6551#6552#0" expanded="true" />
+            <element signature="e#6613#6614#0" expanded="true" />
+            <element signature="e#6643#6644#0" expanded="true" />
+            <element signature="e#6689#6690#0" expanded="true" />
+            <element signature="e#6727#6728#0" expanded="true" />
+            <element signature="e#6796#6797#0" expanded="true" />
+            <element signature="e#6829#6830#0" expanded="true" />
+            <element signature="e#6881#6882#0" expanded="true" />
+            <element signature="e#6925#6926#0" expanded="true" />
+            <element signature="e#6995#6996#0" expanded="true" />
+            <element signature="e#7030#7031#0" expanded="true" />
+            <element signature="e#7086#7087#0" expanded="true" />
+            <element signature="e#7134#7135#0" expanded="true" />
+            <element signature="e#7202#7203#0" expanded="true" />
+            <element signature="e#7233#7234#0" expanded="true" />
+            <element signature="e#7281#7282#0" expanded="true" />
+            <element signature="e#7321#7322#0" expanded="true" />
+            <element signature="e#7390#7391#0" expanded="true" />
+            <element signature="e#7426#7427#0" expanded="true" />
+            <element signature="e#7484#7485#0" expanded="true" />
+            <element signature="e#7534#7535#0" expanded="true" />
+            <element signature="e#7602#7603#0" expanded="true" />
+            <element signature="e#7636#7637#0" expanded="true" />
+            <element signature="e#7690#7691#0" expanded="true" />
+            <element signature="e#7736#7737#0" expanded="true" />
+            <element signature="e#7806#7807#0" expanded="true" />
+            <element signature="e#7840#7841#0" expanded="true" />
+            <element signature="e#7894#7895#0" expanded="true" />
+            <element signature="e#7940#7941#0" expanded="true" />
+            <element signature="e#8006#8007#0" expanded="true" />
+            <element signature="e#8036#8037#0" expanded="true" />
+            <element signature="e#8082#8083#0" expanded="true" />
+            <element signature="e#8120#8121#0" expanded="true" />
+            <element signature="e#8189#8190#0" expanded="true" />
+            <element signature="e#8226#8227#0" expanded="true" />
+            <element signature="e#8286#8287#0" expanded="true" />
+            <element signature="e#8338#8339#0" expanded="true" />
+            <element signature="e#8417#8418#0" expanded="true" />
+            <element signature="e#8457#8458#0" expanded="true" />
+            <element signature="e#8523#8524#0" expanded="true" />
+            <element signature="e#8581#8582#0" expanded="true" />
+            <element signature="e#8655#8656#0" expanded="true" />
+            <element signature="e#8687#8688#0" expanded="true" />
+            <element signature="e#8737#8738#0" expanded="true" />
+            <element signature="e#8779#8780#0" expanded="true" />
+            <element signature="e#8846#8847#0" expanded="true" />
+            <element signature="e#8879#8880#0" expanded="true" />
+            <element signature="e#8931#8932#0" expanded="true" />
+            <element signature="e#8975#8976#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#787#788#0" expanded="true" />
+            <element signature="e#817#818#0" expanded="true" />
+            <element signature="e#2105#2106#0" expanded="true" />
+            <element signature="e#2135#2136#0" expanded="true" />
+            <element signature="e#2431#2432#0" expanded="true" />
+            <element signature="e#2461#2462#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index 854f1f1..0db633a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -165,12 +165,16 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String startDay,String endDay) {
+    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew) {
         try {
 
             Criteria criteria = createCriteria(PgAlarm.class);
             criteria.addOrder(Order.desc("id"));
 
+            if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) {
+                criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
+            }
+
             if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay))
             {
                 criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay)));
@@ -193,9 +197,11 @@
 
                 criteria.add(Restrictions.le("alarmDate",date));
             }
+            if(StringUtils.isNotBlank(isNew)&&isNew.equals("true"))
+                criteria.add(Restrictions.eq("active", 1));
 
             List<PgAlarm> pgAlarmList = criteria.list();
-            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
     }
 
     //根据设备位置(仓位)获取摄像机列表
-    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+    public List<PgDeviceDto> getPgCameraListByPosition(String partition,String position){
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.like("position",position+"%"));
-//        criteria.add(Restrictions.eq("devType","球机"));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(position))
+            criteria.add(Restrictions.like("position",position+"%"));
+
         criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
 
         List<PgDevice> pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
             dto.setDevCode(objects[5].toString());
             dto.setDevType(objects[6].toString());
             if(objects[7]!=null)
-            dto.setIp(objects[7].toString());
+                dto.setIp(objects[7].toString());
             dto.setIsOpen(objects[8].toString());
             dto.setPartition(objects[11].toString());
             dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index 8ebf74d..3c657a7 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgEquipment;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
 import com.casic.PgInterface.devTable.dto.PgEquipmentDto;
@@ -34,9 +35,12 @@
     public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
-        criteria.add(Restrictions.eq("eqName",eqName));
-        criteria.add(Restrictions.eq("eqCode",eqCode));
-        criteria.add(Restrictions.eq("eqType",eqType));
+        if(StringUtils.isNotBlank(eqName))
+            criteria.add(Restrictions.eq("eqName",eqName));
+        if(StringUtils.isNotBlank(eqCode))
+            criteria.add(Restrictions.eq("eqCode",eqCode));
+        if(StringUtils.isNotBlank(eqType))
+            criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
@@ -51,10 +55,9 @@
 
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
-        //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
         String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
-        +eqType+"' group by equipment.EQ_NAME";
+                +eqType+"' group by equipment.EQ_NAME";
 
         List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4ed68e4..e413a5c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
@@ -39,7 +40,8 @@
 
     public List<PgPipeLineDto> getPipeLineByLineType(String lineType) {
         Criteria criteria = createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineType", lineType));
+        if(StringUtils.isNotBlank(lineType))
+            criteria.add(Restrictions.eq("lineType", lineType));
 
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    private Long id;
-    private String keyId;//巡检记录单id
-    private String planId;//巡检计划ID
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    @Column(name="KEY_ID")
-    public String getKeyId() {
-        return keyId;
-    }
-
-    public void setKeyId(String keyId) {
-        this.keyId = keyId;
-    }
-
-    @Column(name="PLAN_ID")
-    public String getPlanId() {
-        return planId;
-    }
-
-    public void setPlanId(String planId) {
-        this.planId = planId;
-    }
-
-    @Column(name="CREATE_DATE")
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    @Column(name="STATE")
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    @Column(name="CREATOR")
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    @Column(name="PLAN_NAME")
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    @Column(name="RECORD_NO")
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    @Column(name="PLAN_NO")
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    @Column(name="RESPONSIBIE_DEPT")
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    @Column(name="INSPECTION_PERSON")
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    @Column(name="PATROL_MAN")
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    @Column(name="OPERATE_DATE")
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    @Column(name="REMARK")
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Column(name="BUILD_CABIN")
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    @Column(name="PROJECT")
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    @Column(name="START_PILE_NO")
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    @Column(name="END_PILE_NO")
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    @Column(name="INSPECTION_PRACE")
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    @Column(name="OTHER_PATROL_MAN")
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-}

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ff69e2a..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,27 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190828.docx" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -32,72 +42,119 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="2" />
-          <entry key="java" value="243" />
-          <entry key="properties" value="6" />
+          <entry key="java" value="321" />
+          <entry key="properties" value="8" />
           <entry key="xml" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
-          <entry key="JAVA" value="243" />
-          <entry key="Properties" value="6" />
+          <entry key="JAVA" value="321" />
+          <entry key="Properties" value="8" />
           <entry key="XML" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="8082" />
-          <entry key="properties" value="49" />
-          <entry key="txt" value="64" />
+          <entry key="dummy" value="16" />
+          <entry key="java" value="10723" />
+          <entry key="properties" value="59" />
+          <entry key="txt" value="118" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="8082" />
-          <entry key="PLAIN_TEXT" value="64" />
-          <entry key="Properties" value="49" />
+          <entry key="JAVA" value="10723" />
+          <entry key="PLAIN_TEXT" value="134" />
+          <entry key="Properties" value="59" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="4" />
+          <entry key="project.closed" value="28" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
           <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.24" value="1" />
+          <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="1" />
-          <entry key="project.open.time.3" value="3" />
-          <entry key="project.open.time.31" value="1" />
+          <entry key="project.open.time.28" value="1" />
+          <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.31" value="2" />
           <entry key="project.open.time.37" value="1" />
+          <entry key="project.open.time.39" value="2" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.40" value="1" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="1" />
+          <entry key="project.open.time.44" value="2" />
           <entry key="project.open.time.45" value="2" />
           <entry key="project.open.time.48" value="1" />
           <entry key="project.open.time.49" value="1" />
+          <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.58" value="1" />
           <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.71" value="1" />
+          <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.71" value="2" />
           <entry key="project.open.time.76" value="1" />
-          <entry key="project.opened" value="25" />
+          <entry key="project.opened" value="41" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+            <state relative-caret-position="174">
+              <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
               <folding>
-                <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-                <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="352">
+              <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#787#788#0" expanded="true" />
+                <element signature="e#817#818#0" expanded="true" />
+                <element signature="e#2105#2106#0" expanded="true" />
+                <element signature="e#2135#2136#0" expanded="true" />
+                <element signature="e#2431#2432#0" expanded="true" />
+                <element signature="e#2461#2462#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="638">
+              <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+              <folding>
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -122,6 +179,7 @@
       <find>getPgDeviceByDevType</find>
       <find>message</find>
       <find>getConstructionByType</find>
+      <find>getPgCameraListByPosition</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -130,24 +188,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanTypeDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
@@ -162,17 +207,38 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
       </list>
     </option>
   </component>
@@ -208,16 +274,18 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="3" />
-    <option name="y" value="10" />
-    <option name="width" value="1386" />
-    <option name="height" value="788" />
+    <option name="x" value="1410" />
+    <option name="y" value="117" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -258,7 +326,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -267,16 +335,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -286,7 +345,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="dto" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -296,7 +355,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="manager" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -308,19 +367,10 @@
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="webapp" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -359,6 +409,7 @@
       </deployment>
       <server-settings>
         <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_7" />
+        <option name="JNDI_PORT" value="10991" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -456,7 +507,23 @@
       <workItem from="1566350810712" duration="6803000" />
       <workItem from="1566435787074" duration="10717000" />
       <workItem from="1566521753529" duration="14265000" />
-      <workItem from="1566614176989" duration="5693000" />
+      <workItem from="1566614176989" duration="14059000" />
+      <workItem from="1566780822009" duration="1026000" />
+      <workItem from="1566891563975" duration="284000" />
+      <workItem from="1566893107340" duration="3382000" />
+      <workItem from="1566953794976" duration="11039000" />
+      <workItem from="1567059357700" duration="484000" />
+      <workItem from="1567082835097" duration="1086000" />
+      <workItem from="1567126428020" duration="1539000" />
+      <workItem from="1567129277820" duration="5788000" />
+      <workItem from="1567136008996" duration="2568000" />
+      <workItem from="1567237040302" duration="111000" />
+      <workItem from="1567495626345" duration="2797000" />
+      <workItem from="1567558770152" duration="2352000" />
+      <workItem from="1567577368149" duration="640000" />
+      <workItem from="1567751224608" duration="780000" />
+      <workItem from="1568019299799" duration="695000" />
+      <workItem from="1568082566133" duration="4016000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -493,17 +560,60 @@
       <option name="project" value="LOCAL" />
       <updated>1566553388171</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="整理管线部分">
+      <created>1566620046627</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1566620046627</updated>
+    </task>
+    <task id="LOCAL-00007" summary="合并代码提交">
+      <created>1566781001910</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1566781001910</updated>
+    </task>
+    <task id="LOCAL-00008" summary="合并代码提交">
+      <created>1566963831930</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1566963831930</updated>
+    </task>
+    <task id="LOCAL-00009" summary="修改报警阈值">
+      <created>1566972146710</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1566972146710</updated>
+    </task>
+    <task id="LOCAL-00010" summary="修改巡检维护表字段">
+      <created>1567126525554</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1567126525554</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="142930000" />
+    <option name="totallyTimeSpent" value="189883000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
+    <frame x="1358" y="-8" width="1456" height="916" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29297996" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -511,13 +621,14 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Thumbnails" weight="0.3295082" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.5081967" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.3849105" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
       <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
       <window_info anchor="bottom" id="Spring" order="8" />
       <window_info anchor="bottom" id="Terminal" order="9" />
@@ -539,7 +650,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2193646" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -547,22 +658,23 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.47540984" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
-      <window_info anchor="bottom" id="Spring" order="8" />
-      <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
-      <window_info anchor="bottom" id="Statistic" order="11" />
-      <window_info anchor="bottom" id="Java Enterprise" order="12" />
-      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="14" weight="0.32786885" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.52307695" />
+      <window_info anchor="bottom" id="Thumbnails" order="0" weight="0.3295082" />
+      <window_info anchor="bottom" id="Message" order="1" />
+      <window_info anchor="bottom" id="Find" order="2" />
+      <window_info anchor="bottom" id="Run" order="3" />
+      <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.49924356" weight="0.49344262" />
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Application Servers" order="8" weight="0.3276923" />
+      <window_info anchor="bottom" id="Spring" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
+      <window_info anchor="bottom" id="Statistic" order="12" />
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <window_info anchor="bottom" id="Database Changes" order="14" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="15" weight="0.32786885" />
+      <window_info anchor="bottom" id="Messages" order="16" weight="0.5229508" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -578,6 +690,16 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -587,7 +709,11 @@
     <MESSAGE value="修改权限问题" />
     <MESSAGE value="修改人员登录返回接口" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整理管线部分" />
+    <MESSAGE value="合并代码提交" />
+    <MESSAGE value="修改报警阈值" />
+    <MESSAGE value="修改巡检维护表字段" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护表字段" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -602,322 +728,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-532">
-          <caret line="50" column="28" lean-forward="true" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="19" column="60" selection-start-line="19" selection-start-column="60" selection-end-line="19" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="100" column="34" lean-forward="true" selection-start-line="100" selection-start-column="34" selection-end-line="100" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1474">
-          <caret line="84" column="58" selection-start-line="84" selection-start-column="58" selection-end-line="84" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1100">
-          <caret line="58" column="18" selection-start-line="58" selection-start-column="18" selection-end-line="58" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6842">
-          <caret line="329" selection-start-line="329" selection-end-line="329" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="102" column="24" lean-forward="true" selection-start-line="102" selection-start-column="24" selection-end-line="102" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="72" column="56" lean-forward="true" selection-start-line="72" selection-start-column="56" selection-end-line="72" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="90" column="39" lean-forward="true" selection-start-line="90" selection-start-column="39" selection-end-line="90" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="97" column="16" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
-          <caret line="14" column="52" lean-forward="true" selection-start-line="14" selection-start-column="52" selection-end-line="14" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="26" column="34" lean-forward="true" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="61" column="1" lean-forward="true" selection-start-line="61" selection-start-column="1" selection-end-line="61" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="208" column="49" lean-forward="true" selection-start-line="208" selection-start-column="49" selection-end-line="208" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="140" column="57" selection-start-line="140" selection-start-column="57" selection-end-line="140" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="111" column="36" selection-start-line="111" selection-start-column="36" selection-end-line="111" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="3" lean-forward="true" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="81" column="58" lean-forward="true" selection-start-line="81" selection-start-column="58" selection-end-line="81" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="472">
-          <caret line="118" column="59" selection-start-line="118" selection-start-column="59" selection-end-line="118" selection-end-column="59" />
-          <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-198">
-          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="69" column="32" lean-forward="true" selection-start-line="69" selection-start-column="32" selection-end-line="70" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="142" column="59" lean-forward="true" selection-start-line="142" selection-start-column="59" selection-end-line="142" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="349" column="9" lean-forward="true" selection-start-line="349" selection-start-column="9" selection-end-line="349" selection-end-column="9" />
-          <folding>
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="e#12105#12121#0" expanded="true" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-686">
-          <caret line="67" column="31" lean-forward="true" selection-start-line="67" selection-start-column="31" selection-end-line="67" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="93" column="24" lean-forward="true" selection-start-line="93" selection-start-column="24" selection-end-line="93" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="57" column="23" lean-forward="true" selection-start-line="57" selection-start-column="23" selection-end-line="57" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-408">
-          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="98" column="40" lean-forward="true" selection-start-line="98" selection-start-column="40" selection-end-line="98" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="572">
@@ -925,13 +735,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="328" column="32" lean-forward="true" selection-start-line="328" selection-start-column="32" selection-end-line="328" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
@@ -950,16 +753,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="396">
           <caret line="23" column="32" lean-forward="true" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
-          <folding>
-            <element signature="e#2635#2636#0" expanded="true" />
-            <element signature="e#2671#2672#0" expanded="true" />
-            <element signature="e#2727#2728#0" expanded="true" />
-            <element signature="e#2777#2778#0" expanded="true" />
-            <element signature="e#2877#2878#0" expanded="true" />
-            <element signature="e#2911#2912#0" expanded="true" />
-            <element signature="e#2963#2964#0" expanded="true" />
-            <element signature="e#3009#3010#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -972,14 +765,481 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+        <state relative-caret-position="66">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="59" column="46" lean-forward="true" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3586">
+          <caret line="179" column="16" selection-start-line="179" selection-start-column="16" selection-end-line="179" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5478">
+          <caret line="273" column="3" selection-start-line="273" selection-start-column="3" selection-end-line="273" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1870">
+          <caret line="147" column="11" selection-start-line="147" selection-start-column="11" selection-end-line="147" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="55" column="15" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="106">
+          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="290" column="41" lean-forward="true" selection-start-line="290" selection-start-column="41" selection-end-line="290" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="21" column="32" lean-forward="true" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="550">
+          <caret line="38" column="89" selection-start-line="38" selection-start-column="89" selection-end-line="38" selection-end-column="89" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="11" column="28" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1166">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="818">
+          <caret line="285" column="13" lean-forward="true" selection-start-line="285" selection-start-column="13" selection-end-line="285" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="129" column="31" lean-forward="true" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="323" column="72" lean-forward="true" selection-start-line="323" selection-start-column="72" selection-end-line="323" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="44" column="13" lean-forward="true" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-638">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="244">
+          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="157">
+          <caret line="16" column="55" lean-forward="true" selection-start-line="16" selection-start-column="55" selection-end-line="16" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="270" column="33" lean-forward="true" selection-start-line="270" selection-start-column="33" selection-end-line="270" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="490">
+          <caret line="141" selection-start-line="141" selection-end-line="141" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="164" column="5" lean-forward="true" selection-start-line="164" selection-start-column="5" selection-end-line="164" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/apiTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-242">
+          <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="61" column="16" lean-forward="true" selection-start-line="61" selection-start-column="16" selection-end-line="61" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="700">
+          <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="12" column="34" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="39" column="9" lean-forward="true" selection-start-line="39" selection-start-column="9" selection-end-line="39" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="32" column="29" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="29" />
           <folding>
-            <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-            <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#1838#1839#0" expanded="true" />
+            <element signature="e#1863#1864#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1925#1926#0" expanded="true" />
+            <element signature="e#1822#1823#0" expanded="true" />
+            <element signature="e#1851#1852#0" expanded="true" />
+            <element signature="e#1895#1896#0" expanded="true" />
+            <element signature="e#1931#1932#0" expanded="true" />
+            <element signature="e#2132#2133#0" expanded="true" />
+            <element signature="e#2164#2165#0" expanded="true" />
+            <element signature="e#2214#2215#0" expanded="true" />
+            <element signature="e#2256#2257#0" expanded="true" />
+            <element signature="e#2330#2331#0" expanded="true" />
+            <element signature="e#2370#2371#0" expanded="true" />
+            <element signature="e#2436#2437#0" expanded="true" />
+            <element signature="e#2494#2495#0" expanded="true" />
+            <element signature="e#2569#2570#0" expanded="true" />
+            <element signature="e#2602#2603#0" expanded="true" />
+            <element signature="e#2654#2655#0" expanded="true" />
+            <element signature="e#2698#2699#0" expanded="true" />
+            <element signature="e#2764#2765#0" expanded="true" />
+            <element signature="e#2795#2796#0" expanded="true" />
+            <element signature="e#2843#2844#0" expanded="true" />
+            <element signature="e#2883#2884#0" expanded="true" />
+            <element signature="e#2948#2949#0" expanded="true" />
+            <element signature="e#2980#2981#0" expanded="true" />
+            <element signature="e#3030#3031#0" expanded="true" />
+            <element signature="e#3072#3073#0" expanded="true" />
+            <element signature="e#3134#3135#0" expanded="true" />
+            <element signature="e#3162#3163#0" expanded="true" />
+            <element signature="e#3204#3205#0" expanded="true" />
+            <element signature="e#3238#3239#0" expanded="true" />
+            <element signature="e#3307#3308#0" expanded="true" />
+            <element signature="e#3346#3347#0" expanded="true" />
+            <element signature="e#3410#3411#0" expanded="true" />
+            <element signature="e#3466#3467#0" expanded="true" />
+            <element signature="e#3537#3538#0" expanded="true" />
+            <element signature="e#3567#3568#0" expanded="true" />
+            <element signature="e#3613#3614#0" expanded="true" />
+            <element signature="e#3651#3652#0" expanded="true" />
+            <element signature="e#3721#3722#0" expanded="true" />
+            <element signature="e#3759#3760#0" expanded="true" />
+            <element signature="e#3821#3822#0" expanded="true" />
+            <element signature="e#3875#3876#0" expanded="true" />
+            <element signature="e#3953#3954#0" expanded="true" />
+            <element signature="e#3991#3992#0" expanded="true" />
+            <element signature="e#4053#4054#0" expanded="true" />
+            <element signature="e#4107#4108#0" expanded="true" />
+            <element signature="e#4186#4187#0" expanded="true" />
+            <element signature="e#4225#4226#0" expanded="true" />
+            <element signature="e#4289#4290#0" expanded="true" />
+            <element signature="e#4345#4346#0" expanded="true" />
+            <element signature="e#4430#4431#0" expanded="true" />
+            <element signature="e#4474#4475#0" expanded="true" />
+            <element signature="e#4698#4699#0" expanded="true" />
+            <element signature="e#4740#4741#0" expanded="true" />
+            <element signature="e#4810#4811#0" expanded="true" />
+            <element signature="e#4872#4873#0" expanded="true" />
+            <element signature="e#4955#4956#0" expanded="true" />
+            <element signature="e#4994#4995#0" expanded="true" />
+            <element signature="e#5058#5059#0" expanded="true" />
+            <element signature="e#5114#5115#0" expanded="true" />
+            <element signature="e#5194#5195#0" expanded="true" />
+            <element signature="e#5233#5234#0" expanded="true" />
+            <element signature="e#5297#5298#0" expanded="true" />
+            <element signature="e#5353#5354#0" expanded="true" />
+            <element signature="e#5428#5429#0" expanded="true" />
+            <element signature="e#5462#5463#0" expanded="true" />
+            <element signature="e#5516#5517#0" expanded="true" />
+            <element signature="e#5562#5563#0" expanded="true" />
+            <element signature="e#5634#5635#0" expanded="true" />
+            <element signature="e#5670#5671#0" expanded="true" />
+            <element signature="e#5728#5729#0" expanded="true" />
+            <element signature="e#5778#5779#0" expanded="true" />
+            <element signature="e#5852#5853#0" expanded="true" />
+            <element signature="e#5888#5889#0" expanded="true" />
+            <element signature="e#5946#5947#0" expanded="true" />
+            <element signature="e#5996#5997#0" expanded="true" />
+            <element signature="e#6067#6068#0" expanded="true" />
+            <element signature="e#6100#6101#0" expanded="true" />
+            <element signature="e#6152#6153#0" expanded="true" />
+            <element signature="e#6196#6197#0" expanded="true" />
+            <element signature="e#6261#6262#0" expanded="true" />
+            <element signature="e#6291#6292#0" expanded="true" />
+            <element signature="e#6337#6338#0" expanded="true" />
+            <element signature="e#6375#6376#0" expanded="true" />
+            <element signature="e#6437#6438#0" expanded="true" />
+            <element signature="e#6467#6468#0" expanded="true" />
+            <element signature="e#6513#6514#0" expanded="true" />
+            <element signature="e#6551#6552#0" expanded="true" />
+            <element signature="e#6613#6614#0" expanded="true" />
+            <element signature="e#6643#6644#0" expanded="true" />
+            <element signature="e#6689#6690#0" expanded="true" />
+            <element signature="e#6727#6728#0" expanded="true" />
+            <element signature="e#6796#6797#0" expanded="true" />
+            <element signature="e#6829#6830#0" expanded="true" />
+            <element signature="e#6881#6882#0" expanded="true" />
+            <element signature="e#6925#6926#0" expanded="true" />
+            <element signature="e#6995#6996#0" expanded="true" />
+            <element signature="e#7030#7031#0" expanded="true" />
+            <element signature="e#7086#7087#0" expanded="true" />
+            <element signature="e#7134#7135#0" expanded="true" />
+            <element signature="e#7202#7203#0" expanded="true" />
+            <element signature="e#7233#7234#0" expanded="true" />
+            <element signature="e#7281#7282#0" expanded="true" />
+            <element signature="e#7321#7322#0" expanded="true" />
+            <element signature="e#7390#7391#0" expanded="true" />
+            <element signature="e#7426#7427#0" expanded="true" />
+            <element signature="e#7484#7485#0" expanded="true" />
+            <element signature="e#7534#7535#0" expanded="true" />
+            <element signature="e#7602#7603#0" expanded="true" />
+            <element signature="e#7636#7637#0" expanded="true" />
+            <element signature="e#7690#7691#0" expanded="true" />
+            <element signature="e#7736#7737#0" expanded="true" />
+            <element signature="e#7806#7807#0" expanded="true" />
+            <element signature="e#7840#7841#0" expanded="true" />
+            <element signature="e#7894#7895#0" expanded="true" />
+            <element signature="e#7940#7941#0" expanded="true" />
+            <element signature="e#8006#8007#0" expanded="true" />
+            <element signature="e#8036#8037#0" expanded="true" />
+            <element signature="e#8082#8083#0" expanded="true" />
+            <element signature="e#8120#8121#0" expanded="true" />
+            <element signature="e#8189#8190#0" expanded="true" />
+            <element signature="e#8226#8227#0" expanded="true" />
+            <element signature="e#8286#8287#0" expanded="true" />
+            <element signature="e#8338#8339#0" expanded="true" />
+            <element signature="e#8417#8418#0" expanded="true" />
+            <element signature="e#8457#8458#0" expanded="true" />
+            <element signature="e#8523#8524#0" expanded="true" />
+            <element signature="e#8581#8582#0" expanded="true" />
+            <element signature="e#8655#8656#0" expanded="true" />
+            <element signature="e#8687#8688#0" expanded="true" />
+            <element signature="e#8737#8738#0" expanded="true" />
+            <element signature="e#8779#8780#0" expanded="true" />
+            <element signature="e#8846#8847#0" expanded="true" />
+            <element signature="e#8879#8880#0" expanded="true" />
+            <element signature="e#8931#8932#0" expanded="true" />
+            <element signature="e#8975#8976#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#787#788#0" expanded="true" />
+            <element signature="e#817#818#0" expanded="true" />
+            <element signature="e#2105#2106#0" expanded="true" />
+            <element signature="e#2135#2136#0" expanded="true" />
+            <element signature="e#2431#2432#0" expanded="true" />
+            <element signature="e#2461#2462#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index 854f1f1..0db633a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -165,12 +165,16 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String startDay,String endDay) {
+    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew) {
         try {
 
             Criteria criteria = createCriteria(PgAlarm.class);
             criteria.addOrder(Order.desc("id"));
 
+            if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) {
+                criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
+            }
+
             if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay))
             {
                 criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay)));
@@ -193,9 +197,11 @@
 
                 criteria.add(Restrictions.le("alarmDate",date));
             }
+            if(StringUtils.isNotBlank(isNew)&&isNew.equals("true"))
+                criteria.add(Restrictions.eq("active", 1));
 
             List<PgAlarm> pgAlarmList = criteria.list();
-            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
     }
 
     //根据设备位置(仓位)获取摄像机列表
-    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+    public List<PgDeviceDto> getPgCameraListByPosition(String partition,String position){
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.like("position",position+"%"));
-//        criteria.add(Restrictions.eq("devType","球机"));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(position))
+            criteria.add(Restrictions.like("position",position+"%"));
+
         criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
 
         List<PgDevice> pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
             dto.setDevCode(objects[5].toString());
             dto.setDevType(objects[6].toString());
             if(objects[7]!=null)
-            dto.setIp(objects[7].toString());
+                dto.setIp(objects[7].toString());
             dto.setIsOpen(objects[8].toString());
             dto.setPartition(objects[11].toString());
             dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index 8ebf74d..3c657a7 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgEquipment;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
 import com.casic.PgInterface.devTable.dto.PgEquipmentDto;
@@ -34,9 +35,12 @@
     public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
-        criteria.add(Restrictions.eq("eqName",eqName));
-        criteria.add(Restrictions.eq("eqCode",eqCode));
-        criteria.add(Restrictions.eq("eqType",eqType));
+        if(StringUtils.isNotBlank(eqName))
+            criteria.add(Restrictions.eq("eqName",eqName));
+        if(StringUtils.isNotBlank(eqCode))
+            criteria.add(Restrictions.eq("eqCode",eqCode));
+        if(StringUtils.isNotBlank(eqType))
+            criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
@@ -51,10 +55,9 @@
 
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
-        //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
         String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
-        +eqType+"' group by equipment.EQ_NAME";
+                +eqType+"' group by equipment.EQ_NAME";
 
         List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4ed68e4..e413a5c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
@@ -39,7 +40,8 @@
 
     public List<PgPipeLineDto> getPipeLineByLineType(String lineType) {
         Criteria criteria = createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineType", lineType));
+        if(StringUtils.isNotBlank(lineType))
+            criteria.add(Restrictions.eq("lineType", lineType));
 
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    private Long id;
-    private String keyId;//巡检记录单id
-    private String planId;//巡检计划ID
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    @Column(name="KEY_ID")
-    public String getKeyId() {
-        return keyId;
-    }
-
-    public void setKeyId(String keyId) {
-        this.keyId = keyId;
-    }
-
-    @Column(name="PLAN_ID")
-    public String getPlanId() {
-        return planId;
-    }
-
-    public void setPlanId(String planId) {
-        this.planId = planId;
-    }
-
-    @Column(name="CREATE_DATE")
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    @Column(name="STATE")
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    @Column(name="CREATOR")
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    @Column(name="PLAN_NAME")
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    @Column(name="RECORD_NO")
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    @Column(name="PLAN_NO")
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    @Column(name="RESPONSIBIE_DEPT")
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    @Column(name="INSPECTION_PERSON")
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    @Column(name="PATROL_MAN")
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    @Column(name="OPERATE_DATE")
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    @Column(name="REMARK")
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Column(name="BUILD_CABIN")
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    @Column(name="PROJECT")
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    @Column(name="START_PILE_NO")
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    @Column(name="END_PILE_NO")
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    @Column(name="INSPECTION_PRACE")
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    @Column(name="OTHER_PATROL_MAN")
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private Long id;
+    private String KEY_ID;//唯一键值
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_PERSON;//巡检人
+    private String START_DATE;//巡检开始时间
+    private String END_DATE;
+    private String FREQUENCY;//巡检频率
+    private String STATE;//状态
+    private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+    private String PLAN_NO;//巡检计划编号
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_MODE;//巡检方式
+    private String INSPECTION_ROUTE;//巡检路线
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String INSPECTION_GROUP;//巡检部门
+    private String INSERT_TIME;//插入时间
+    private String FREQUENCYDATE;//巡检具体日期
+    private String FREQUENCYTIME;//巡检具体时间
+    private String CREATEDATE;//创建时间
+    private String CREATOR;//创建人
+    private String PROJECT;//项目
+    private String COMLILE;//编制人
+    private String START_TIME;//编制时间
+    private String DEVELOP_DEPT;//制定部门
+    private String END_TIME;//结束时间
+    private String START_PILE_NO;//开始桩号
+    private String END_PILE_NO;//结束桩号
+    private String BUILD_CABIN;//巡检舱室
+    private String MILEAGE;
+    private String FREQUENCY_TIME;//巡检具体时间
+    private String FREQUENCYTIME_END;
+    private String KETTLE_TS;
+    private String UPDATEDATE;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="KEY_ID")
+    public String getKEY_ID() {
+        return KEY_ID;
+    }
+
+    public void setKEY_ID(String KEY_ID) {
+        this.KEY_ID = KEY_ID;
+    }
+
+    @Column(name="PLAN_NAME")
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    @Column(name="INSPECTION_PERSON")
+    public String getINSPECTION_PERSON() {
+        return INSPECTION_PERSON;
+    }
+
+    public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+        this.INSPECTION_PERSON = INSPECTION_PERSON;
+    }
+
+    @Column(name="START_DATE")
+    public String getSTART_DATE() {
+        return START_DATE;
+    }
+
+    public void setSTART_DATE(String START_DATE) {
+        this.START_DATE = START_DATE;
+    }
+
+    @Column(name="END_DATE")
+    public String getEND_DATE() {
+        return END_DATE;
+    }
+
+    public void setEND_DATE(String END_DATE) {
+        this.END_DATE = END_DATE;
+    }
+
+    @Column(name="FREQUENCY")
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    @Column(name="STATE")
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    @Column(name="RESPONSIBLE_DEPT")
+    public String getRESPONSIBLE_DEPT() {
+        return RESPONSIBLE_DEPT;
+    }
+
+    public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+        this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+    }
+
+    @Column(name="PLAN_NO")
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    @Column(name="INSPECTION_TYPE")
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    @Column(name="INSPECTION_MODE")
+    public String getINSPECTION_MODE() {
+        return INSPECTION_MODE;
+    }
+
+    public void setINSPECTION_MODE(String INSPECTION_MODE) {
+        this.INSPECTION_MODE = INSPECTION_MODE;
+    }
+
+    @Column(name="INSPECTION_ROUTE")
+    public String getINSPECTION_ROUTE() {
+        return INSPECTION_ROUTE;
+    }
+
+    public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+        this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+    }
+
+    @Column(name="INSPECTION_START_TIME")
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    @Column(name="INSPECTION_END_TIME")
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    @Column(name="INSPECTION_PRACE")
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    @Column(name="INSPECTION_GROUP")
+    public String getINSPECTION_GROUP() {
+        return INSPECTION_GROUP;
+    }
+
+    public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+        this.INSPECTION_GROUP = INSPECTION_GROUP;
+    }
+
+    @Column(name="INSERT_TIME")
+    public String getINSERT_TIME() {
+        return INSERT_TIME;
+    }
+
+    public void setINSERT_TIME(String INSERT_TIME) {
+        this.INSERT_TIME = INSERT_TIME;
+    }
+
+    @Column(name="FREQUENCYDATE")
+    public String getFREQUENCYDATE() {
+        return FREQUENCYDATE;
+    }
+
+    public void setFREQUENCYDATE(String FREQUENCYDATE) {
+        this.FREQUENCYDATE = FREQUENCYDATE;
+    }
+
+    @Column(name="FREQUENCYTIME")
+    public String getFREQUENCYTIME() {
+        return FREQUENCYTIME;
+    }
+
+    public void setFREQUENCYTIME(String FREQUENCYTIME) {
+        this.FREQUENCYTIME = FREQUENCYTIME;
+    }
+
+    @Column(name="CREATEDATE")
+    public String getCREATEDATE() {
+        return CREATEDATE;
+    }
+
+    public void setCREATEDATE(String CREATEDATE) {
+        this.CREATEDATE = CREATEDATE;
+    }
+
+    @Column(name="CREATOR")
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    @Column(name="PROJECT")
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    @Column(name="COMLILE")
+    public String getCOMLILE() {
+        return COMLILE;
+    }
+
+    public void setCOMLILE(String COMLILE) {
+        this.COMLILE = COMLILE;
+    }
+
+    @Column(name="START_TIME")
+    public String getSTART_TIME() {
+        return START_TIME;
+    }
+
+    public void setSTART_TIME(String START_TIME) {
+        this.START_TIME = START_TIME;
+    }
+
+    @Column(name="DEVELOP_DEPT")
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    @Column(name="END_TIME")
+    public String getEND_TIME() {
+        return END_TIME;
+    }
+
+    public void setEND_TIME(String END_TIME) {
+        this.END_TIME = END_TIME;
+    }
+
+    @Column(name="START_PILE_NO")
+    public String getSTART_PILE_NO() {
+        return START_PILE_NO;
+    }
+
+    public void setSTART_PILE_NO(String START_PILE_NO) {
+        this.START_PILE_NO = START_PILE_NO;
+    }
+
+    @Column(name="END_PILE_NO")
+    public String getEND_PILE_NO() {
+        return END_PILE_NO;
+    }
+
+    public void setEND_PILE_NO(String END_PILE_NO) {
+        this.END_PILE_NO = END_PILE_NO;
+    }
+
+    @Column(name="BUILD_CABIN")
+    public String getBUILD_CABIN() {
+        return BUILD_CABIN;
+    }
+
+    public void setBUILD_CABIN(String BUILD_CABIN) {
+        this.BUILD_CABIN = BUILD_CABIN;
+    }
+
+    @Column(name="MILEAGE")
+    public String getMILEAGE() {
+        return MILEAGE;
+    }
+
+    public void setMILEAGE(String MILEAGE) {
+        this.MILEAGE = MILEAGE;
+    }
+
+    @Column(name="FREQUENCY_TIME")
+    public String getFREQUENCY_TIME() {
+        return FREQUENCY_TIME;
+    }
+
+    public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+        this.FREQUENCY_TIME = FREQUENCY_TIME;
+    }
+
+    @Column(name="FREQUENCYTIME_END")
+    public String getFREQUENCYTIME_END() {
+        return FREQUENCYTIME_END;
+    }
+
+    public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+        this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+    }
+
+    @Column(name="KETTLE_TS")
+    public String getKETTLE_TS() {
+        return KETTLE_TS;
+    }
+
+    public void setKETTLE_TS(String KETTLE_TS) {
+        this.KETTLE_TS = KETTLE_TS;
+    }
+
+    @Column(name="UPDATEDATE")
+    public String getUPDATEDATE() {
+        return UPDATEDATE;
+    }
+
+    public void setUPDATEDATE(String UPDATEDATE) {
+        this.UPDATEDATE = UPDATEDATE;
+    }
+}

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ff69e2a..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,27 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190828.docx" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -32,72 +42,119 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="2" />
-          <entry key="java" value="243" />
-          <entry key="properties" value="6" />
+          <entry key="java" value="321" />
+          <entry key="properties" value="8" />
           <entry key="xml" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
-          <entry key="JAVA" value="243" />
-          <entry key="Properties" value="6" />
+          <entry key="JAVA" value="321" />
+          <entry key="Properties" value="8" />
           <entry key="XML" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="8082" />
-          <entry key="properties" value="49" />
-          <entry key="txt" value="64" />
+          <entry key="dummy" value="16" />
+          <entry key="java" value="10723" />
+          <entry key="properties" value="59" />
+          <entry key="txt" value="118" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="8082" />
-          <entry key="PLAIN_TEXT" value="64" />
-          <entry key="Properties" value="49" />
+          <entry key="JAVA" value="10723" />
+          <entry key="PLAIN_TEXT" value="134" />
+          <entry key="Properties" value="59" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="4" />
+          <entry key="project.closed" value="28" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
           <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.24" value="1" />
+          <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="1" />
-          <entry key="project.open.time.3" value="3" />
-          <entry key="project.open.time.31" value="1" />
+          <entry key="project.open.time.28" value="1" />
+          <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.31" value="2" />
           <entry key="project.open.time.37" value="1" />
+          <entry key="project.open.time.39" value="2" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.40" value="1" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="1" />
+          <entry key="project.open.time.44" value="2" />
           <entry key="project.open.time.45" value="2" />
           <entry key="project.open.time.48" value="1" />
           <entry key="project.open.time.49" value="1" />
+          <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.58" value="1" />
           <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.71" value="1" />
+          <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.71" value="2" />
           <entry key="project.open.time.76" value="1" />
-          <entry key="project.opened" value="25" />
+          <entry key="project.opened" value="41" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+            <state relative-caret-position="174">
+              <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
               <folding>
-                <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-                <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="352">
+              <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#787#788#0" expanded="true" />
+                <element signature="e#817#818#0" expanded="true" />
+                <element signature="e#2105#2106#0" expanded="true" />
+                <element signature="e#2135#2136#0" expanded="true" />
+                <element signature="e#2431#2432#0" expanded="true" />
+                <element signature="e#2461#2462#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="638">
+              <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+              <folding>
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -122,6 +179,7 @@
       <find>getPgDeviceByDevType</find>
       <find>message</find>
       <find>getConstructionByType</find>
+      <find>getPgCameraListByPosition</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -130,24 +188,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanTypeDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
@@ -162,17 +207,38 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
       </list>
     </option>
   </component>
@@ -208,16 +274,18 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="3" />
-    <option name="y" value="10" />
-    <option name="width" value="1386" />
-    <option name="height" value="788" />
+    <option name="x" value="1410" />
+    <option name="y" value="117" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -258,7 +326,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -267,16 +335,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -286,7 +345,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="dto" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -296,7 +355,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="manager" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -308,19 +367,10 @@
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="webapp" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -359,6 +409,7 @@
       </deployment>
       <server-settings>
         <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_7" />
+        <option name="JNDI_PORT" value="10991" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -456,7 +507,23 @@
       <workItem from="1566350810712" duration="6803000" />
       <workItem from="1566435787074" duration="10717000" />
       <workItem from="1566521753529" duration="14265000" />
-      <workItem from="1566614176989" duration="5693000" />
+      <workItem from="1566614176989" duration="14059000" />
+      <workItem from="1566780822009" duration="1026000" />
+      <workItem from="1566891563975" duration="284000" />
+      <workItem from="1566893107340" duration="3382000" />
+      <workItem from="1566953794976" duration="11039000" />
+      <workItem from="1567059357700" duration="484000" />
+      <workItem from="1567082835097" duration="1086000" />
+      <workItem from="1567126428020" duration="1539000" />
+      <workItem from="1567129277820" duration="5788000" />
+      <workItem from="1567136008996" duration="2568000" />
+      <workItem from="1567237040302" duration="111000" />
+      <workItem from="1567495626345" duration="2797000" />
+      <workItem from="1567558770152" duration="2352000" />
+      <workItem from="1567577368149" duration="640000" />
+      <workItem from="1567751224608" duration="780000" />
+      <workItem from="1568019299799" duration="695000" />
+      <workItem from="1568082566133" duration="4016000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -493,17 +560,60 @@
       <option name="project" value="LOCAL" />
       <updated>1566553388171</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="整理管线部分">
+      <created>1566620046627</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1566620046627</updated>
+    </task>
+    <task id="LOCAL-00007" summary="合并代码提交">
+      <created>1566781001910</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1566781001910</updated>
+    </task>
+    <task id="LOCAL-00008" summary="合并代码提交">
+      <created>1566963831930</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1566963831930</updated>
+    </task>
+    <task id="LOCAL-00009" summary="修改报警阈值">
+      <created>1566972146710</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1566972146710</updated>
+    </task>
+    <task id="LOCAL-00010" summary="修改巡检维护表字段">
+      <created>1567126525554</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1567126525554</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="142930000" />
+    <option name="totallyTimeSpent" value="189883000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
+    <frame x="1358" y="-8" width="1456" height="916" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29297996" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -511,13 +621,14 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Thumbnails" weight="0.3295082" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.5081967" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.3849105" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
       <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
       <window_info anchor="bottom" id="Spring" order="8" />
       <window_info anchor="bottom" id="Terminal" order="9" />
@@ -539,7 +650,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2193646" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -547,22 +658,23 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.47540984" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
-      <window_info anchor="bottom" id="Spring" order="8" />
-      <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
-      <window_info anchor="bottom" id="Statistic" order="11" />
-      <window_info anchor="bottom" id="Java Enterprise" order="12" />
-      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="14" weight="0.32786885" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.52307695" />
+      <window_info anchor="bottom" id="Thumbnails" order="0" weight="0.3295082" />
+      <window_info anchor="bottom" id="Message" order="1" />
+      <window_info anchor="bottom" id="Find" order="2" />
+      <window_info anchor="bottom" id="Run" order="3" />
+      <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.49924356" weight="0.49344262" />
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Application Servers" order="8" weight="0.3276923" />
+      <window_info anchor="bottom" id="Spring" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
+      <window_info anchor="bottom" id="Statistic" order="12" />
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <window_info anchor="bottom" id="Database Changes" order="14" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="15" weight="0.32786885" />
+      <window_info anchor="bottom" id="Messages" order="16" weight="0.5229508" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -578,6 +690,16 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -587,7 +709,11 @@
     <MESSAGE value="修改权限问题" />
     <MESSAGE value="修改人员登录返回接口" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整理管线部分" />
+    <MESSAGE value="合并代码提交" />
+    <MESSAGE value="修改报警阈值" />
+    <MESSAGE value="修改巡检维护表字段" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护表字段" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -602,322 +728,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-532">
-          <caret line="50" column="28" lean-forward="true" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="19" column="60" selection-start-line="19" selection-start-column="60" selection-end-line="19" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="100" column="34" lean-forward="true" selection-start-line="100" selection-start-column="34" selection-end-line="100" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1474">
-          <caret line="84" column="58" selection-start-line="84" selection-start-column="58" selection-end-line="84" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1100">
-          <caret line="58" column="18" selection-start-line="58" selection-start-column="18" selection-end-line="58" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6842">
-          <caret line="329" selection-start-line="329" selection-end-line="329" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="102" column="24" lean-forward="true" selection-start-line="102" selection-start-column="24" selection-end-line="102" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="72" column="56" lean-forward="true" selection-start-line="72" selection-start-column="56" selection-end-line="72" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="90" column="39" lean-forward="true" selection-start-line="90" selection-start-column="39" selection-end-line="90" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="97" column="16" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
-          <caret line="14" column="52" lean-forward="true" selection-start-line="14" selection-start-column="52" selection-end-line="14" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="26" column="34" lean-forward="true" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="61" column="1" lean-forward="true" selection-start-line="61" selection-start-column="1" selection-end-line="61" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="208" column="49" lean-forward="true" selection-start-line="208" selection-start-column="49" selection-end-line="208" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="140" column="57" selection-start-line="140" selection-start-column="57" selection-end-line="140" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="111" column="36" selection-start-line="111" selection-start-column="36" selection-end-line="111" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="3" lean-forward="true" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="81" column="58" lean-forward="true" selection-start-line="81" selection-start-column="58" selection-end-line="81" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="472">
-          <caret line="118" column="59" selection-start-line="118" selection-start-column="59" selection-end-line="118" selection-end-column="59" />
-          <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-198">
-          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="69" column="32" lean-forward="true" selection-start-line="69" selection-start-column="32" selection-end-line="70" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="142" column="59" lean-forward="true" selection-start-line="142" selection-start-column="59" selection-end-line="142" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="349" column="9" lean-forward="true" selection-start-line="349" selection-start-column="9" selection-end-line="349" selection-end-column="9" />
-          <folding>
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="e#12105#12121#0" expanded="true" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-686">
-          <caret line="67" column="31" lean-forward="true" selection-start-line="67" selection-start-column="31" selection-end-line="67" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="93" column="24" lean-forward="true" selection-start-line="93" selection-start-column="24" selection-end-line="93" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="57" column="23" lean-forward="true" selection-start-line="57" selection-start-column="23" selection-end-line="57" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-408">
-          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="98" column="40" lean-forward="true" selection-start-line="98" selection-start-column="40" selection-end-line="98" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="572">
@@ -925,13 +735,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="328" column="32" lean-forward="true" selection-start-line="328" selection-start-column="32" selection-end-line="328" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
@@ -950,16 +753,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="396">
           <caret line="23" column="32" lean-forward="true" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
-          <folding>
-            <element signature="e#2635#2636#0" expanded="true" />
-            <element signature="e#2671#2672#0" expanded="true" />
-            <element signature="e#2727#2728#0" expanded="true" />
-            <element signature="e#2777#2778#0" expanded="true" />
-            <element signature="e#2877#2878#0" expanded="true" />
-            <element signature="e#2911#2912#0" expanded="true" />
-            <element signature="e#2963#2964#0" expanded="true" />
-            <element signature="e#3009#3010#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -972,14 +765,481 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+        <state relative-caret-position="66">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="59" column="46" lean-forward="true" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3586">
+          <caret line="179" column="16" selection-start-line="179" selection-start-column="16" selection-end-line="179" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5478">
+          <caret line="273" column="3" selection-start-line="273" selection-start-column="3" selection-end-line="273" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1870">
+          <caret line="147" column="11" selection-start-line="147" selection-start-column="11" selection-end-line="147" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="55" column="15" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="106">
+          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="290" column="41" lean-forward="true" selection-start-line="290" selection-start-column="41" selection-end-line="290" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="21" column="32" lean-forward="true" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="550">
+          <caret line="38" column="89" selection-start-line="38" selection-start-column="89" selection-end-line="38" selection-end-column="89" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="11" column="28" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1166">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="818">
+          <caret line="285" column="13" lean-forward="true" selection-start-line="285" selection-start-column="13" selection-end-line="285" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="129" column="31" lean-forward="true" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="323" column="72" lean-forward="true" selection-start-line="323" selection-start-column="72" selection-end-line="323" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="44" column="13" lean-forward="true" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-638">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="244">
+          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="157">
+          <caret line="16" column="55" lean-forward="true" selection-start-line="16" selection-start-column="55" selection-end-line="16" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="270" column="33" lean-forward="true" selection-start-line="270" selection-start-column="33" selection-end-line="270" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="490">
+          <caret line="141" selection-start-line="141" selection-end-line="141" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="164" column="5" lean-forward="true" selection-start-line="164" selection-start-column="5" selection-end-line="164" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/apiTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-242">
+          <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="61" column="16" lean-forward="true" selection-start-line="61" selection-start-column="16" selection-end-line="61" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="700">
+          <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="12" column="34" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="39" column="9" lean-forward="true" selection-start-line="39" selection-start-column="9" selection-end-line="39" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="32" column="29" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="29" />
           <folding>
-            <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-            <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#1838#1839#0" expanded="true" />
+            <element signature="e#1863#1864#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1925#1926#0" expanded="true" />
+            <element signature="e#1822#1823#0" expanded="true" />
+            <element signature="e#1851#1852#0" expanded="true" />
+            <element signature="e#1895#1896#0" expanded="true" />
+            <element signature="e#1931#1932#0" expanded="true" />
+            <element signature="e#2132#2133#0" expanded="true" />
+            <element signature="e#2164#2165#0" expanded="true" />
+            <element signature="e#2214#2215#0" expanded="true" />
+            <element signature="e#2256#2257#0" expanded="true" />
+            <element signature="e#2330#2331#0" expanded="true" />
+            <element signature="e#2370#2371#0" expanded="true" />
+            <element signature="e#2436#2437#0" expanded="true" />
+            <element signature="e#2494#2495#0" expanded="true" />
+            <element signature="e#2569#2570#0" expanded="true" />
+            <element signature="e#2602#2603#0" expanded="true" />
+            <element signature="e#2654#2655#0" expanded="true" />
+            <element signature="e#2698#2699#0" expanded="true" />
+            <element signature="e#2764#2765#0" expanded="true" />
+            <element signature="e#2795#2796#0" expanded="true" />
+            <element signature="e#2843#2844#0" expanded="true" />
+            <element signature="e#2883#2884#0" expanded="true" />
+            <element signature="e#2948#2949#0" expanded="true" />
+            <element signature="e#2980#2981#0" expanded="true" />
+            <element signature="e#3030#3031#0" expanded="true" />
+            <element signature="e#3072#3073#0" expanded="true" />
+            <element signature="e#3134#3135#0" expanded="true" />
+            <element signature="e#3162#3163#0" expanded="true" />
+            <element signature="e#3204#3205#0" expanded="true" />
+            <element signature="e#3238#3239#0" expanded="true" />
+            <element signature="e#3307#3308#0" expanded="true" />
+            <element signature="e#3346#3347#0" expanded="true" />
+            <element signature="e#3410#3411#0" expanded="true" />
+            <element signature="e#3466#3467#0" expanded="true" />
+            <element signature="e#3537#3538#0" expanded="true" />
+            <element signature="e#3567#3568#0" expanded="true" />
+            <element signature="e#3613#3614#0" expanded="true" />
+            <element signature="e#3651#3652#0" expanded="true" />
+            <element signature="e#3721#3722#0" expanded="true" />
+            <element signature="e#3759#3760#0" expanded="true" />
+            <element signature="e#3821#3822#0" expanded="true" />
+            <element signature="e#3875#3876#0" expanded="true" />
+            <element signature="e#3953#3954#0" expanded="true" />
+            <element signature="e#3991#3992#0" expanded="true" />
+            <element signature="e#4053#4054#0" expanded="true" />
+            <element signature="e#4107#4108#0" expanded="true" />
+            <element signature="e#4186#4187#0" expanded="true" />
+            <element signature="e#4225#4226#0" expanded="true" />
+            <element signature="e#4289#4290#0" expanded="true" />
+            <element signature="e#4345#4346#0" expanded="true" />
+            <element signature="e#4430#4431#0" expanded="true" />
+            <element signature="e#4474#4475#0" expanded="true" />
+            <element signature="e#4698#4699#0" expanded="true" />
+            <element signature="e#4740#4741#0" expanded="true" />
+            <element signature="e#4810#4811#0" expanded="true" />
+            <element signature="e#4872#4873#0" expanded="true" />
+            <element signature="e#4955#4956#0" expanded="true" />
+            <element signature="e#4994#4995#0" expanded="true" />
+            <element signature="e#5058#5059#0" expanded="true" />
+            <element signature="e#5114#5115#0" expanded="true" />
+            <element signature="e#5194#5195#0" expanded="true" />
+            <element signature="e#5233#5234#0" expanded="true" />
+            <element signature="e#5297#5298#0" expanded="true" />
+            <element signature="e#5353#5354#0" expanded="true" />
+            <element signature="e#5428#5429#0" expanded="true" />
+            <element signature="e#5462#5463#0" expanded="true" />
+            <element signature="e#5516#5517#0" expanded="true" />
+            <element signature="e#5562#5563#0" expanded="true" />
+            <element signature="e#5634#5635#0" expanded="true" />
+            <element signature="e#5670#5671#0" expanded="true" />
+            <element signature="e#5728#5729#0" expanded="true" />
+            <element signature="e#5778#5779#0" expanded="true" />
+            <element signature="e#5852#5853#0" expanded="true" />
+            <element signature="e#5888#5889#0" expanded="true" />
+            <element signature="e#5946#5947#0" expanded="true" />
+            <element signature="e#5996#5997#0" expanded="true" />
+            <element signature="e#6067#6068#0" expanded="true" />
+            <element signature="e#6100#6101#0" expanded="true" />
+            <element signature="e#6152#6153#0" expanded="true" />
+            <element signature="e#6196#6197#0" expanded="true" />
+            <element signature="e#6261#6262#0" expanded="true" />
+            <element signature="e#6291#6292#0" expanded="true" />
+            <element signature="e#6337#6338#0" expanded="true" />
+            <element signature="e#6375#6376#0" expanded="true" />
+            <element signature="e#6437#6438#0" expanded="true" />
+            <element signature="e#6467#6468#0" expanded="true" />
+            <element signature="e#6513#6514#0" expanded="true" />
+            <element signature="e#6551#6552#0" expanded="true" />
+            <element signature="e#6613#6614#0" expanded="true" />
+            <element signature="e#6643#6644#0" expanded="true" />
+            <element signature="e#6689#6690#0" expanded="true" />
+            <element signature="e#6727#6728#0" expanded="true" />
+            <element signature="e#6796#6797#0" expanded="true" />
+            <element signature="e#6829#6830#0" expanded="true" />
+            <element signature="e#6881#6882#0" expanded="true" />
+            <element signature="e#6925#6926#0" expanded="true" />
+            <element signature="e#6995#6996#0" expanded="true" />
+            <element signature="e#7030#7031#0" expanded="true" />
+            <element signature="e#7086#7087#0" expanded="true" />
+            <element signature="e#7134#7135#0" expanded="true" />
+            <element signature="e#7202#7203#0" expanded="true" />
+            <element signature="e#7233#7234#0" expanded="true" />
+            <element signature="e#7281#7282#0" expanded="true" />
+            <element signature="e#7321#7322#0" expanded="true" />
+            <element signature="e#7390#7391#0" expanded="true" />
+            <element signature="e#7426#7427#0" expanded="true" />
+            <element signature="e#7484#7485#0" expanded="true" />
+            <element signature="e#7534#7535#0" expanded="true" />
+            <element signature="e#7602#7603#0" expanded="true" />
+            <element signature="e#7636#7637#0" expanded="true" />
+            <element signature="e#7690#7691#0" expanded="true" />
+            <element signature="e#7736#7737#0" expanded="true" />
+            <element signature="e#7806#7807#0" expanded="true" />
+            <element signature="e#7840#7841#0" expanded="true" />
+            <element signature="e#7894#7895#0" expanded="true" />
+            <element signature="e#7940#7941#0" expanded="true" />
+            <element signature="e#8006#8007#0" expanded="true" />
+            <element signature="e#8036#8037#0" expanded="true" />
+            <element signature="e#8082#8083#0" expanded="true" />
+            <element signature="e#8120#8121#0" expanded="true" />
+            <element signature="e#8189#8190#0" expanded="true" />
+            <element signature="e#8226#8227#0" expanded="true" />
+            <element signature="e#8286#8287#0" expanded="true" />
+            <element signature="e#8338#8339#0" expanded="true" />
+            <element signature="e#8417#8418#0" expanded="true" />
+            <element signature="e#8457#8458#0" expanded="true" />
+            <element signature="e#8523#8524#0" expanded="true" />
+            <element signature="e#8581#8582#0" expanded="true" />
+            <element signature="e#8655#8656#0" expanded="true" />
+            <element signature="e#8687#8688#0" expanded="true" />
+            <element signature="e#8737#8738#0" expanded="true" />
+            <element signature="e#8779#8780#0" expanded="true" />
+            <element signature="e#8846#8847#0" expanded="true" />
+            <element signature="e#8879#8880#0" expanded="true" />
+            <element signature="e#8931#8932#0" expanded="true" />
+            <element signature="e#8975#8976#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#787#788#0" expanded="true" />
+            <element signature="e#817#818#0" expanded="true" />
+            <element signature="e#2105#2106#0" expanded="true" />
+            <element signature="e#2135#2136#0" expanded="true" />
+            <element signature="e#2431#2432#0" expanded="true" />
+            <element signature="e#2461#2462#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index 854f1f1..0db633a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -165,12 +165,16 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String startDay,String endDay) {
+    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew) {
         try {
 
             Criteria criteria = createCriteria(PgAlarm.class);
             criteria.addOrder(Order.desc("id"));
 
+            if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) {
+                criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
+            }
+
             if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay))
             {
                 criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay)));
@@ -193,9 +197,11 @@
 
                 criteria.add(Restrictions.le("alarmDate",date));
             }
+            if(StringUtils.isNotBlank(isNew)&&isNew.equals("true"))
+                criteria.add(Restrictions.eq("active", 1));
 
             List<PgAlarm> pgAlarmList = criteria.list();
-            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
     }
 
     //根据设备位置(仓位)获取摄像机列表
-    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+    public List<PgDeviceDto> getPgCameraListByPosition(String partition,String position){
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.like("position",position+"%"));
-//        criteria.add(Restrictions.eq("devType","球机"));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(position))
+            criteria.add(Restrictions.like("position",position+"%"));
+
         criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
 
         List<PgDevice> pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
             dto.setDevCode(objects[5].toString());
             dto.setDevType(objects[6].toString());
             if(objects[7]!=null)
-            dto.setIp(objects[7].toString());
+                dto.setIp(objects[7].toString());
             dto.setIsOpen(objects[8].toString());
             dto.setPartition(objects[11].toString());
             dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index 8ebf74d..3c657a7 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgEquipment;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
 import com.casic.PgInterface.devTable.dto.PgEquipmentDto;
@@ -34,9 +35,12 @@
     public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
-        criteria.add(Restrictions.eq("eqName",eqName));
-        criteria.add(Restrictions.eq("eqCode",eqCode));
-        criteria.add(Restrictions.eq("eqType",eqType));
+        if(StringUtils.isNotBlank(eqName))
+            criteria.add(Restrictions.eq("eqName",eqName));
+        if(StringUtils.isNotBlank(eqCode))
+            criteria.add(Restrictions.eq("eqCode",eqCode));
+        if(StringUtils.isNotBlank(eqType))
+            criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
@@ -51,10 +55,9 @@
 
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
-        //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
         String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
-        +eqType+"' group by equipment.EQ_NAME";
+                +eqType+"' group by equipment.EQ_NAME";
 
         List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4ed68e4..e413a5c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
@@ -39,7 +40,8 @@
 
     public List<PgPipeLineDto> getPipeLineByLineType(String lineType) {
         Criteria criteria = createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineType", lineType));
+        if(StringUtils.isNotBlank(lineType))
+            criteria.add(Restrictions.eq("lineType", lineType));
 
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    private Long id;
-    private String keyId;//巡检记录单id
-    private String planId;//巡检计划ID
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    @Column(name="KEY_ID")
-    public String getKeyId() {
-        return keyId;
-    }
-
-    public void setKeyId(String keyId) {
-        this.keyId = keyId;
-    }
-
-    @Column(name="PLAN_ID")
-    public String getPlanId() {
-        return planId;
-    }
-
-    public void setPlanId(String planId) {
-        this.planId = planId;
-    }
-
-    @Column(name="CREATE_DATE")
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    @Column(name="STATE")
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    @Column(name="CREATOR")
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    @Column(name="PLAN_NAME")
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    @Column(name="RECORD_NO")
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    @Column(name="PLAN_NO")
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    @Column(name="RESPONSIBIE_DEPT")
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    @Column(name="INSPECTION_PERSON")
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    @Column(name="PATROL_MAN")
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    @Column(name="OPERATE_DATE")
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    @Column(name="REMARK")
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Column(name="BUILD_CABIN")
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    @Column(name="PROJECT")
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    @Column(name="START_PILE_NO")
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    @Column(name="END_PILE_NO")
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    @Column(name="INSPECTION_PRACE")
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    @Column(name="OTHER_PATROL_MAN")
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private Long id;
+    private String KEY_ID;//唯一键值
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_PERSON;//巡检人
+    private String START_DATE;//巡检开始时间
+    private String END_DATE;
+    private String FREQUENCY;//巡检频率
+    private String STATE;//状态
+    private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+    private String PLAN_NO;//巡检计划编号
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_MODE;//巡检方式
+    private String INSPECTION_ROUTE;//巡检路线
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String INSPECTION_GROUP;//巡检部门
+    private String INSERT_TIME;//插入时间
+    private String FREQUENCYDATE;//巡检具体日期
+    private String FREQUENCYTIME;//巡检具体时间
+    private String CREATEDATE;//创建时间
+    private String CREATOR;//创建人
+    private String PROJECT;//项目
+    private String COMLILE;//编制人
+    private String START_TIME;//编制时间
+    private String DEVELOP_DEPT;//制定部门
+    private String END_TIME;//结束时间
+    private String START_PILE_NO;//开始桩号
+    private String END_PILE_NO;//结束桩号
+    private String BUILD_CABIN;//巡检舱室
+    private String MILEAGE;
+    private String FREQUENCY_TIME;//巡检具体时间
+    private String FREQUENCYTIME_END;
+    private String KETTLE_TS;
+    private String UPDATEDATE;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="KEY_ID")
+    public String getKEY_ID() {
+        return KEY_ID;
+    }
+
+    public void setKEY_ID(String KEY_ID) {
+        this.KEY_ID = KEY_ID;
+    }
+
+    @Column(name="PLAN_NAME")
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    @Column(name="INSPECTION_PERSON")
+    public String getINSPECTION_PERSON() {
+        return INSPECTION_PERSON;
+    }
+
+    public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+        this.INSPECTION_PERSON = INSPECTION_PERSON;
+    }
+
+    @Column(name="START_DATE")
+    public String getSTART_DATE() {
+        return START_DATE;
+    }
+
+    public void setSTART_DATE(String START_DATE) {
+        this.START_DATE = START_DATE;
+    }
+
+    @Column(name="END_DATE")
+    public String getEND_DATE() {
+        return END_DATE;
+    }
+
+    public void setEND_DATE(String END_DATE) {
+        this.END_DATE = END_DATE;
+    }
+
+    @Column(name="FREQUENCY")
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    @Column(name="STATE")
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    @Column(name="RESPONSIBLE_DEPT")
+    public String getRESPONSIBLE_DEPT() {
+        return RESPONSIBLE_DEPT;
+    }
+
+    public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+        this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+    }
+
+    @Column(name="PLAN_NO")
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    @Column(name="INSPECTION_TYPE")
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    @Column(name="INSPECTION_MODE")
+    public String getINSPECTION_MODE() {
+        return INSPECTION_MODE;
+    }
+
+    public void setINSPECTION_MODE(String INSPECTION_MODE) {
+        this.INSPECTION_MODE = INSPECTION_MODE;
+    }
+
+    @Column(name="INSPECTION_ROUTE")
+    public String getINSPECTION_ROUTE() {
+        return INSPECTION_ROUTE;
+    }
+
+    public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+        this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+    }
+
+    @Column(name="INSPECTION_START_TIME")
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    @Column(name="INSPECTION_END_TIME")
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    @Column(name="INSPECTION_PRACE")
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    @Column(name="INSPECTION_GROUP")
+    public String getINSPECTION_GROUP() {
+        return INSPECTION_GROUP;
+    }
+
+    public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+        this.INSPECTION_GROUP = INSPECTION_GROUP;
+    }
+
+    @Column(name="INSERT_TIME")
+    public String getINSERT_TIME() {
+        return INSERT_TIME;
+    }
+
+    public void setINSERT_TIME(String INSERT_TIME) {
+        this.INSERT_TIME = INSERT_TIME;
+    }
+
+    @Column(name="FREQUENCYDATE")
+    public String getFREQUENCYDATE() {
+        return FREQUENCYDATE;
+    }
+
+    public void setFREQUENCYDATE(String FREQUENCYDATE) {
+        this.FREQUENCYDATE = FREQUENCYDATE;
+    }
+
+    @Column(name="FREQUENCYTIME")
+    public String getFREQUENCYTIME() {
+        return FREQUENCYTIME;
+    }
+
+    public void setFREQUENCYTIME(String FREQUENCYTIME) {
+        this.FREQUENCYTIME = FREQUENCYTIME;
+    }
+
+    @Column(name="CREATEDATE")
+    public String getCREATEDATE() {
+        return CREATEDATE;
+    }
+
+    public void setCREATEDATE(String CREATEDATE) {
+        this.CREATEDATE = CREATEDATE;
+    }
+
+    @Column(name="CREATOR")
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    @Column(name="PROJECT")
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    @Column(name="COMLILE")
+    public String getCOMLILE() {
+        return COMLILE;
+    }
+
+    public void setCOMLILE(String COMLILE) {
+        this.COMLILE = COMLILE;
+    }
+
+    @Column(name="START_TIME")
+    public String getSTART_TIME() {
+        return START_TIME;
+    }
+
+    public void setSTART_TIME(String START_TIME) {
+        this.START_TIME = START_TIME;
+    }
+
+    @Column(name="DEVELOP_DEPT")
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    @Column(name="END_TIME")
+    public String getEND_TIME() {
+        return END_TIME;
+    }
+
+    public void setEND_TIME(String END_TIME) {
+        this.END_TIME = END_TIME;
+    }
+
+    @Column(name="START_PILE_NO")
+    public String getSTART_PILE_NO() {
+        return START_PILE_NO;
+    }
+
+    public void setSTART_PILE_NO(String START_PILE_NO) {
+        this.START_PILE_NO = START_PILE_NO;
+    }
+
+    @Column(name="END_PILE_NO")
+    public String getEND_PILE_NO() {
+        return END_PILE_NO;
+    }
+
+    public void setEND_PILE_NO(String END_PILE_NO) {
+        this.END_PILE_NO = END_PILE_NO;
+    }
+
+    @Column(name="BUILD_CABIN")
+    public String getBUILD_CABIN() {
+        return BUILD_CABIN;
+    }
+
+    public void setBUILD_CABIN(String BUILD_CABIN) {
+        this.BUILD_CABIN = BUILD_CABIN;
+    }
+
+    @Column(name="MILEAGE")
+    public String getMILEAGE() {
+        return MILEAGE;
+    }
+
+    public void setMILEAGE(String MILEAGE) {
+        this.MILEAGE = MILEAGE;
+    }
+
+    @Column(name="FREQUENCY_TIME")
+    public String getFREQUENCY_TIME() {
+        return FREQUENCY_TIME;
+    }
+
+    public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+        this.FREQUENCY_TIME = FREQUENCY_TIME;
+    }
+
+    @Column(name="FREQUENCYTIME_END")
+    public String getFREQUENCYTIME_END() {
+        return FREQUENCYTIME_END;
+    }
+
+    public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+        this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+    }
+
+    @Column(name="KETTLE_TS")
+    public String getKETTLE_TS() {
+        return KETTLE_TS;
+    }
+
+    public void setKETTLE_TS(String KETTLE_TS) {
+        this.KETTLE_TS = KETTLE_TS;
+    }
+
+    @Column(name="UPDATEDATE")
+    public String getUPDATEDATE() {
+        return UPDATEDATE;
+    }
+
+    public void setUPDATEDATE(String UPDATEDATE) {
+        this.UPDATEDATE = UPDATEDATE;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 5346b57..2f8d359 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -66,7 +66,7 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REPAIRMAN")
+    @Column(name="REOAIRMAN")
     public String getRepairMan() {
         return repairMan;
     }

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ff69e2a..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,27 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190828.docx" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -32,72 +42,119 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="2" />
-          <entry key="java" value="243" />
-          <entry key="properties" value="6" />
+          <entry key="java" value="321" />
+          <entry key="properties" value="8" />
           <entry key="xml" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
-          <entry key="JAVA" value="243" />
-          <entry key="Properties" value="6" />
+          <entry key="JAVA" value="321" />
+          <entry key="Properties" value="8" />
           <entry key="XML" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="8082" />
-          <entry key="properties" value="49" />
-          <entry key="txt" value="64" />
+          <entry key="dummy" value="16" />
+          <entry key="java" value="10723" />
+          <entry key="properties" value="59" />
+          <entry key="txt" value="118" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="8082" />
-          <entry key="PLAIN_TEXT" value="64" />
-          <entry key="Properties" value="49" />
+          <entry key="JAVA" value="10723" />
+          <entry key="PLAIN_TEXT" value="134" />
+          <entry key="Properties" value="59" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="4" />
+          <entry key="project.closed" value="28" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
           <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.24" value="1" />
+          <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="1" />
-          <entry key="project.open.time.3" value="3" />
-          <entry key="project.open.time.31" value="1" />
+          <entry key="project.open.time.28" value="1" />
+          <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.31" value="2" />
           <entry key="project.open.time.37" value="1" />
+          <entry key="project.open.time.39" value="2" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.40" value="1" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="1" />
+          <entry key="project.open.time.44" value="2" />
           <entry key="project.open.time.45" value="2" />
           <entry key="project.open.time.48" value="1" />
           <entry key="project.open.time.49" value="1" />
+          <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.58" value="1" />
           <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.71" value="1" />
+          <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.71" value="2" />
           <entry key="project.open.time.76" value="1" />
-          <entry key="project.opened" value="25" />
+          <entry key="project.opened" value="41" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+            <state relative-caret-position="174">
+              <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
               <folding>
-                <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-                <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="352">
+              <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#787#788#0" expanded="true" />
+                <element signature="e#817#818#0" expanded="true" />
+                <element signature="e#2105#2106#0" expanded="true" />
+                <element signature="e#2135#2136#0" expanded="true" />
+                <element signature="e#2431#2432#0" expanded="true" />
+                <element signature="e#2461#2462#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="638">
+              <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+              <folding>
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -122,6 +179,7 @@
       <find>getPgDeviceByDevType</find>
       <find>message</find>
       <find>getConstructionByType</find>
+      <find>getPgCameraListByPosition</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -130,24 +188,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanTypeDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
@@ -162,17 +207,38 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
       </list>
     </option>
   </component>
@@ -208,16 +274,18 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="3" />
-    <option name="y" value="10" />
-    <option name="width" value="1386" />
-    <option name="height" value="788" />
+    <option name="x" value="1410" />
+    <option name="y" value="117" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -258,7 +326,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -267,16 +335,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -286,7 +345,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="dto" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -296,7 +355,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="manager" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -308,19 +367,10 @@
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="webapp" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -359,6 +409,7 @@
       </deployment>
       <server-settings>
         <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_7" />
+        <option name="JNDI_PORT" value="10991" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -456,7 +507,23 @@
       <workItem from="1566350810712" duration="6803000" />
       <workItem from="1566435787074" duration="10717000" />
       <workItem from="1566521753529" duration="14265000" />
-      <workItem from="1566614176989" duration="5693000" />
+      <workItem from="1566614176989" duration="14059000" />
+      <workItem from="1566780822009" duration="1026000" />
+      <workItem from="1566891563975" duration="284000" />
+      <workItem from="1566893107340" duration="3382000" />
+      <workItem from="1566953794976" duration="11039000" />
+      <workItem from="1567059357700" duration="484000" />
+      <workItem from="1567082835097" duration="1086000" />
+      <workItem from="1567126428020" duration="1539000" />
+      <workItem from="1567129277820" duration="5788000" />
+      <workItem from="1567136008996" duration="2568000" />
+      <workItem from="1567237040302" duration="111000" />
+      <workItem from="1567495626345" duration="2797000" />
+      <workItem from="1567558770152" duration="2352000" />
+      <workItem from="1567577368149" duration="640000" />
+      <workItem from="1567751224608" duration="780000" />
+      <workItem from="1568019299799" duration="695000" />
+      <workItem from="1568082566133" duration="4016000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -493,17 +560,60 @@
       <option name="project" value="LOCAL" />
       <updated>1566553388171</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="整理管线部分">
+      <created>1566620046627</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1566620046627</updated>
+    </task>
+    <task id="LOCAL-00007" summary="合并代码提交">
+      <created>1566781001910</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1566781001910</updated>
+    </task>
+    <task id="LOCAL-00008" summary="合并代码提交">
+      <created>1566963831930</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1566963831930</updated>
+    </task>
+    <task id="LOCAL-00009" summary="修改报警阈值">
+      <created>1566972146710</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1566972146710</updated>
+    </task>
+    <task id="LOCAL-00010" summary="修改巡检维护表字段">
+      <created>1567126525554</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1567126525554</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="142930000" />
+    <option name="totallyTimeSpent" value="189883000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
+    <frame x="1358" y="-8" width="1456" height="916" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29297996" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -511,13 +621,14 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Thumbnails" weight="0.3295082" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.5081967" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.3849105" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
       <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
       <window_info anchor="bottom" id="Spring" order="8" />
       <window_info anchor="bottom" id="Terminal" order="9" />
@@ -539,7 +650,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2193646" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -547,22 +658,23 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.47540984" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
-      <window_info anchor="bottom" id="Spring" order="8" />
-      <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
-      <window_info anchor="bottom" id="Statistic" order="11" />
-      <window_info anchor="bottom" id="Java Enterprise" order="12" />
-      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="14" weight="0.32786885" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.52307695" />
+      <window_info anchor="bottom" id="Thumbnails" order="0" weight="0.3295082" />
+      <window_info anchor="bottom" id="Message" order="1" />
+      <window_info anchor="bottom" id="Find" order="2" />
+      <window_info anchor="bottom" id="Run" order="3" />
+      <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.49924356" weight="0.49344262" />
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Application Servers" order="8" weight="0.3276923" />
+      <window_info anchor="bottom" id="Spring" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
+      <window_info anchor="bottom" id="Statistic" order="12" />
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <window_info anchor="bottom" id="Database Changes" order="14" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="15" weight="0.32786885" />
+      <window_info anchor="bottom" id="Messages" order="16" weight="0.5229508" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -578,6 +690,16 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -587,7 +709,11 @@
     <MESSAGE value="修改权限问题" />
     <MESSAGE value="修改人员登录返回接口" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整理管线部分" />
+    <MESSAGE value="合并代码提交" />
+    <MESSAGE value="修改报警阈值" />
+    <MESSAGE value="修改巡检维护表字段" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护表字段" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -602,322 +728,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-532">
-          <caret line="50" column="28" lean-forward="true" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="19" column="60" selection-start-line="19" selection-start-column="60" selection-end-line="19" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="100" column="34" lean-forward="true" selection-start-line="100" selection-start-column="34" selection-end-line="100" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1474">
-          <caret line="84" column="58" selection-start-line="84" selection-start-column="58" selection-end-line="84" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1100">
-          <caret line="58" column="18" selection-start-line="58" selection-start-column="18" selection-end-line="58" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6842">
-          <caret line="329" selection-start-line="329" selection-end-line="329" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="102" column="24" lean-forward="true" selection-start-line="102" selection-start-column="24" selection-end-line="102" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="72" column="56" lean-forward="true" selection-start-line="72" selection-start-column="56" selection-end-line="72" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="90" column="39" lean-forward="true" selection-start-line="90" selection-start-column="39" selection-end-line="90" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="97" column="16" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
-          <caret line="14" column="52" lean-forward="true" selection-start-line="14" selection-start-column="52" selection-end-line="14" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="26" column="34" lean-forward="true" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="61" column="1" lean-forward="true" selection-start-line="61" selection-start-column="1" selection-end-line="61" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="208" column="49" lean-forward="true" selection-start-line="208" selection-start-column="49" selection-end-line="208" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="140" column="57" selection-start-line="140" selection-start-column="57" selection-end-line="140" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="111" column="36" selection-start-line="111" selection-start-column="36" selection-end-line="111" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="3" lean-forward="true" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="81" column="58" lean-forward="true" selection-start-line="81" selection-start-column="58" selection-end-line="81" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="472">
-          <caret line="118" column="59" selection-start-line="118" selection-start-column="59" selection-end-line="118" selection-end-column="59" />
-          <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-198">
-          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="69" column="32" lean-forward="true" selection-start-line="69" selection-start-column="32" selection-end-line="70" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="142" column="59" lean-forward="true" selection-start-line="142" selection-start-column="59" selection-end-line="142" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="349" column="9" lean-forward="true" selection-start-line="349" selection-start-column="9" selection-end-line="349" selection-end-column="9" />
-          <folding>
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="e#12105#12121#0" expanded="true" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-686">
-          <caret line="67" column="31" lean-forward="true" selection-start-line="67" selection-start-column="31" selection-end-line="67" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="93" column="24" lean-forward="true" selection-start-line="93" selection-start-column="24" selection-end-line="93" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="57" column="23" lean-forward="true" selection-start-line="57" selection-start-column="23" selection-end-line="57" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-408">
-          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="98" column="40" lean-forward="true" selection-start-line="98" selection-start-column="40" selection-end-line="98" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="572">
@@ -925,13 +735,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="328" column="32" lean-forward="true" selection-start-line="328" selection-start-column="32" selection-end-line="328" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
@@ -950,16 +753,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="396">
           <caret line="23" column="32" lean-forward="true" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
-          <folding>
-            <element signature="e#2635#2636#0" expanded="true" />
-            <element signature="e#2671#2672#0" expanded="true" />
-            <element signature="e#2727#2728#0" expanded="true" />
-            <element signature="e#2777#2778#0" expanded="true" />
-            <element signature="e#2877#2878#0" expanded="true" />
-            <element signature="e#2911#2912#0" expanded="true" />
-            <element signature="e#2963#2964#0" expanded="true" />
-            <element signature="e#3009#3010#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -972,14 +765,481 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+        <state relative-caret-position="66">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="59" column="46" lean-forward="true" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3586">
+          <caret line="179" column="16" selection-start-line="179" selection-start-column="16" selection-end-line="179" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5478">
+          <caret line="273" column="3" selection-start-line="273" selection-start-column="3" selection-end-line="273" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1870">
+          <caret line="147" column="11" selection-start-line="147" selection-start-column="11" selection-end-line="147" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="55" column="15" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="106">
+          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="290" column="41" lean-forward="true" selection-start-line="290" selection-start-column="41" selection-end-line="290" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="21" column="32" lean-forward="true" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="550">
+          <caret line="38" column="89" selection-start-line="38" selection-start-column="89" selection-end-line="38" selection-end-column="89" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="11" column="28" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1166">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="818">
+          <caret line="285" column="13" lean-forward="true" selection-start-line="285" selection-start-column="13" selection-end-line="285" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="129" column="31" lean-forward="true" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="323" column="72" lean-forward="true" selection-start-line="323" selection-start-column="72" selection-end-line="323" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="44" column="13" lean-forward="true" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-638">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="244">
+          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="157">
+          <caret line="16" column="55" lean-forward="true" selection-start-line="16" selection-start-column="55" selection-end-line="16" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="270" column="33" lean-forward="true" selection-start-line="270" selection-start-column="33" selection-end-line="270" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="490">
+          <caret line="141" selection-start-line="141" selection-end-line="141" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="164" column="5" lean-forward="true" selection-start-line="164" selection-start-column="5" selection-end-line="164" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/apiTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-242">
+          <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="61" column="16" lean-forward="true" selection-start-line="61" selection-start-column="16" selection-end-line="61" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="700">
+          <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="12" column="34" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="39" column="9" lean-forward="true" selection-start-line="39" selection-start-column="9" selection-end-line="39" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="32" column="29" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="29" />
           <folding>
-            <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-            <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#1838#1839#0" expanded="true" />
+            <element signature="e#1863#1864#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1925#1926#0" expanded="true" />
+            <element signature="e#1822#1823#0" expanded="true" />
+            <element signature="e#1851#1852#0" expanded="true" />
+            <element signature="e#1895#1896#0" expanded="true" />
+            <element signature="e#1931#1932#0" expanded="true" />
+            <element signature="e#2132#2133#0" expanded="true" />
+            <element signature="e#2164#2165#0" expanded="true" />
+            <element signature="e#2214#2215#0" expanded="true" />
+            <element signature="e#2256#2257#0" expanded="true" />
+            <element signature="e#2330#2331#0" expanded="true" />
+            <element signature="e#2370#2371#0" expanded="true" />
+            <element signature="e#2436#2437#0" expanded="true" />
+            <element signature="e#2494#2495#0" expanded="true" />
+            <element signature="e#2569#2570#0" expanded="true" />
+            <element signature="e#2602#2603#0" expanded="true" />
+            <element signature="e#2654#2655#0" expanded="true" />
+            <element signature="e#2698#2699#0" expanded="true" />
+            <element signature="e#2764#2765#0" expanded="true" />
+            <element signature="e#2795#2796#0" expanded="true" />
+            <element signature="e#2843#2844#0" expanded="true" />
+            <element signature="e#2883#2884#0" expanded="true" />
+            <element signature="e#2948#2949#0" expanded="true" />
+            <element signature="e#2980#2981#0" expanded="true" />
+            <element signature="e#3030#3031#0" expanded="true" />
+            <element signature="e#3072#3073#0" expanded="true" />
+            <element signature="e#3134#3135#0" expanded="true" />
+            <element signature="e#3162#3163#0" expanded="true" />
+            <element signature="e#3204#3205#0" expanded="true" />
+            <element signature="e#3238#3239#0" expanded="true" />
+            <element signature="e#3307#3308#0" expanded="true" />
+            <element signature="e#3346#3347#0" expanded="true" />
+            <element signature="e#3410#3411#0" expanded="true" />
+            <element signature="e#3466#3467#0" expanded="true" />
+            <element signature="e#3537#3538#0" expanded="true" />
+            <element signature="e#3567#3568#0" expanded="true" />
+            <element signature="e#3613#3614#0" expanded="true" />
+            <element signature="e#3651#3652#0" expanded="true" />
+            <element signature="e#3721#3722#0" expanded="true" />
+            <element signature="e#3759#3760#0" expanded="true" />
+            <element signature="e#3821#3822#0" expanded="true" />
+            <element signature="e#3875#3876#0" expanded="true" />
+            <element signature="e#3953#3954#0" expanded="true" />
+            <element signature="e#3991#3992#0" expanded="true" />
+            <element signature="e#4053#4054#0" expanded="true" />
+            <element signature="e#4107#4108#0" expanded="true" />
+            <element signature="e#4186#4187#0" expanded="true" />
+            <element signature="e#4225#4226#0" expanded="true" />
+            <element signature="e#4289#4290#0" expanded="true" />
+            <element signature="e#4345#4346#0" expanded="true" />
+            <element signature="e#4430#4431#0" expanded="true" />
+            <element signature="e#4474#4475#0" expanded="true" />
+            <element signature="e#4698#4699#0" expanded="true" />
+            <element signature="e#4740#4741#0" expanded="true" />
+            <element signature="e#4810#4811#0" expanded="true" />
+            <element signature="e#4872#4873#0" expanded="true" />
+            <element signature="e#4955#4956#0" expanded="true" />
+            <element signature="e#4994#4995#0" expanded="true" />
+            <element signature="e#5058#5059#0" expanded="true" />
+            <element signature="e#5114#5115#0" expanded="true" />
+            <element signature="e#5194#5195#0" expanded="true" />
+            <element signature="e#5233#5234#0" expanded="true" />
+            <element signature="e#5297#5298#0" expanded="true" />
+            <element signature="e#5353#5354#0" expanded="true" />
+            <element signature="e#5428#5429#0" expanded="true" />
+            <element signature="e#5462#5463#0" expanded="true" />
+            <element signature="e#5516#5517#0" expanded="true" />
+            <element signature="e#5562#5563#0" expanded="true" />
+            <element signature="e#5634#5635#0" expanded="true" />
+            <element signature="e#5670#5671#0" expanded="true" />
+            <element signature="e#5728#5729#0" expanded="true" />
+            <element signature="e#5778#5779#0" expanded="true" />
+            <element signature="e#5852#5853#0" expanded="true" />
+            <element signature="e#5888#5889#0" expanded="true" />
+            <element signature="e#5946#5947#0" expanded="true" />
+            <element signature="e#5996#5997#0" expanded="true" />
+            <element signature="e#6067#6068#0" expanded="true" />
+            <element signature="e#6100#6101#0" expanded="true" />
+            <element signature="e#6152#6153#0" expanded="true" />
+            <element signature="e#6196#6197#0" expanded="true" />
+            <element signature="e#6261#6262#0" expanded="true" />
+            <element signature="e#6291#6292#0" expanded="true" />
+            <element signature="e#6337#6338#0" expanded="true" />
+            <element signature="e#6375#6376#0" expanded="true" />
+            <element signature="e#6437#6438#0" expanded="true" />
+            <element signature="e#6467#6468#0" expanded="true" />
+            <element signature="e#6513#6514#0" expanded="true" />
+            <element signature="e#6551#6552#0" expanded="true" />
+            <element signature="e#6613#6614#0" expanded="true" />
+            <element signature="e#6643#6644#0" expanded="true" />
+            <element signature="e#6689#6690#0" expanded="true" />
+            <element signature="e#6727#6728#0" expanded="true" />
+            <element signature="e#6796#6797#0" expanded="true" />
+            <element signature="e#6829#6830#0" expanded="true" />
+            <element signature="e#6881#6882#0" expanded="true" />
+            <element signature="e#6925#6926#0" expanded="true" />
+            <element signature="e#6995#6996#0" expanded="true" />
+            <element signature="e#7030#7031#0" expanded="true" />
+            <element signature="e#7086#7087#0" expanded="true" />
+            <element signature="e#7134#7135#0" expanded="true" />
+            <element signature="e#7202#7203#0" expanded="true" />
+            <element signature="e#7233#7234#0" expanded="true" />
+            <element signature="e#7281#7282#0" expanded="true" />
+            <element signature="e#7321#7322#0" expanded="true" />
+            <element signature="e#7390#7391#0" expanded="true" />
+            <element signature="e#7426#7427#0" expanded="true" />
+            <element signature="e#7484#7485#0" expanded="true" />
+            <element signature="e#7534#7535#0" expanded="true" />
+            <element signature="e#7602#7603#0" expanded="true" />
+            <element signature="e#7636#7637#0" expanded="true" />
+            <element signature="e#7690#7691#0" expanded="true" />
+            <element signature="e#7736#7737#0" expanded="true" />
+            <element signature="e#7806#7807#0" expanded="true" />
+            <element signature="e#7840#7841#0" expanded="true" />
+            <element signature="e#7894#7895#0" expanded="true" />
+            <element signature="e#7940#7941#0" expanded="true" />
+            <element signature="e#8006#8007#0" expanded="true" />
+            <element signature="e#8036#8037#0" expanded="true" />
+            <element signature="e#8082#8083#0" expanded="true" />
+            <element signature="e#8120#8121#0" expanded="true" />
+            <element signature="e#8189#8190#0" expanded="true" />
+            <element signature="e#8226#8227#0" expanded="true" />
+            <element signature="e#8286#8287#0" expanded="true" />
+            <element signature="e#8338#8339#0" expanded="true" />
+            <element signature="e#8417#8418#0" expanded="true" />
+            <element signature="e#8457#8458#0" expanded="true" />
+            <element signature="e#8523#8524#0" expanded="true" />
+            <element signature="e#8581#8582#0" expanded="true" />
+            <element signature="e#8655#8656#0" expanded="true" />
+            <element signature="e#8687#8688#0" expanded="true" />
+            <element signature="e#8737#8738#0" expanded="true" />
+            <element signature="e#8779#8780#0" expanded="true" />
+            <element signature="e#8846#8847#0" expanded="true" />
+            <element signature="e#8879#8880#0" expanded="true" />
+            <element signature="e#8931#8932#0" expanded="true" />
+            <element signature="e#8975#8976#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#787#788#0" expanded="true" />
+            <element signature="e#817#818#0" expanded="true" />
+            <element signature="e#2105#2106#0" expanded="true" />
+            <element signature="e#2135#2136#0" expanded="true" />
+            <element signature="e#2431#2432#0" expanded="true" />
+            <element signature="e#2461#2462#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index 854f1f1..0db633a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -165,12 +165,16 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String startDay,String endDay) {
+    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew) {
         try {
 
             Criteria criteria = createCriteria(PgAlarm.class);
             criteria.addOrder(Order.desc("id"));
 
+            if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) {
+                criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
+            }
+
             if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay))
             {
                 criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay)));
@@ -193,9 +197,11 @@
 
                 criteria.add(Restrictions.le("alarmDate",date));
             }
+            if(StringUtils.isNotBlank(isNew)&&isNew.equals("true"))
+                criteria.add(Restrictions.eq("active", 1));
 
             List<PgAlarm> pgAlarmList = criteria.list();
-            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
     }
 
     //根据设备位置(仓位)获取摄像机列表
-    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+    public List<PgDeviceDto> getPgCameraListByPosition(String partition,String position){
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.like("position",position+"%"));
-//        criteria.add(Restrictions.eq("devType","球机"));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(position))
+            criteria.add(Restrictions.like("position",position+"%"));
+
         criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
 
         List<PgDevice> pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
             dto.setDevCode(objects[5].toString());
             dto.setDevType(objects[6].toString());
             if(objects[7]!=null)
-            dto.setIp(objects[7].toString());
+                dto.setIp(objects[7].toString());
             dto.setIsOpen(objects[8].toString());
             dto.setPartition(objects[11].toString());
             dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index 8ebf74d..3c657a7 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgEquipment;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
 import com.casic.PgInterface.devTable.dto.PgEquipmentDto;
@@ -34,9 +35,12 @@
     public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
-        criteria.add(Restrictions.eq("eqName",eqName));
-        criteria.add(Restrictions.eq("eqCode",eqCode));
-        criteria.add(Restrictions.eq("eqType",eqType));
+        if(StringUtils.isNotBlank(eqName))
+            criteria.add(Restrictions.eq("eqName",eqName));
+        if(StringUtils.isNotBlank(eqCode))
+            criteria.add(Restrictions.eq("eqCode",eqCode));
+        if(StringUtils.isNotBlank(eqType))
+            criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
@@ -51,10 +55,9 @@
 
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
-        //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
         String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
-        +eqType+"' group by equipment.EQ_NAME";
+                +eqType+"' group by equipment.EQ_NAME";
 
         List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4ed68e4..e413a5c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
@@ -39,7 +40,8 @@
 
     public List<PgPipeLineDto> getPipeLineByLineType(String lineType) {
         Criteria criteria = createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineType", lineType));
+        if(StringUtils.isNotBlank(lineType))
+            criteria.add(Restrictions.eq("lineType", lineType));
 
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    private Long id;
-    private String keyId;//巡检记录单id
-    private String planId;//巡检计划ID
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    @Column(name="KEY_ID")
-    public String getKeyId() {
-        return keyId;
-    }
-
-    public void setKeyId(String keyId) {
-        this.keyId = keyId;
-    }
-
-    @Column(name="PLAN_ID")
-    public String getPlanId() {
-        return planId;
-    }
-
-    public void setPlanId(String planId) {
-        this.planId = planId;
-    }
-
-    @Column(name="CREATE_DATE")
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    @Column(name="STATE")
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    @Column(name="CREATOR")
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    @Column(name="PLAN_NAME")
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    @Column(name="RECORD_NO")
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    @Column(name="PLAN_NO")
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    @Column(name="RESPONSIBIE_DEPT")
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    @Column(name="INSPECTION_PERSON")
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    @Column(name="PATROL_MAN")
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    @Column(name="OPERATE_DATE")
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    @Column(name="REMARK")
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Column(name="BUILD_CABIN")
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    @Column(name="PROJECT")
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    @Column(name="START_PILE_NO")
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    @Column(name="END_PILE_NO")
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    @Column(name="INSPECTION_PRACE")
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    @Column(name="OTHER_PATROL_MAN")
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private Long id;
+    private String KEY_ID;//唯一键值
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_PERSON;//巡检人
+    private String START_DATE;//巡检开始时间
+    private String END_DATE;
+    private String FREQUENCY;//巡检频率
+    private String STATE;//状态
+    private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+    private String PLAN_NO;//巡检计划编号
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_MODE;//巡检方式
+    private String INSPECTION_ROUTE;//巡检路线
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String INSPECTION_GROUP;//巡检部门
+    private String INSERT_TIME;//插入时间
+    private String FREQUENCYDATE;//巡检具体日期
+    private String FREQUENCYTIME;//巡检具体时间
+    private String CREATEDATE;//创建时间
+    private String CREATOR;//创建人
+    private String PROJECT;//项目
+    private String COMLILE;//编制人
+    private String START_TIME;//编制时间
+    private String DEVELOP_DEPT;//制定部门
+    private String END_TIME;//结束时间
+    private String START_PILE_NO;//开始桩号
+    private String END_PILE_NO;//结束桩号
+    private String BUILD_CABIN;//巡检舱室
+    private String MILEAGE;
+    private String FREQUENCY_TIME;//巡检具体时间
+    private String FREQUENCYTIME_END;
+    private String KETTLE_TS;
+    private String UPDATEDATE;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="KEY_ID")
+    public String getKEY_ID() {
+        return KEY_ID;
+    }
+
+    public void setKEY_ID(String KEY_ID) {
+        this.KEY_ID = KEY_ID;
+    }
+
+    @Column(name="PLAN_NAME")
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    @Column(name="INSPECTION_PERSON")
+    public String getINSPECTION_PERSON() {
+        return INSPECTION_PERSON;
+    }
+
+    public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+        this.INSPECTION_PERSON = INSPECTION_PERSON;
+    }
+
+    @Column(name="START_DATE")
+    public String getSTART_DATE() {
+        return START_DATE;
+    }
+
+    public void setSTART_DATE(String START_DATE) {
+        this.START_DATE = START_DATE;
+    }
+
+    @Column(name="END_DATE")
+    public String getEND_DATE() {
+        return END_DATE;
+    }
+
+    public void setEND_DATE(String END_DATE) {
+        this.END_DATE = END_DATE;
+    }
+
+    @Column(name="FREQUENCY")
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    @Column(name="STATE")
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    @Column(name="RESPONSIBLE_DEPT")
+    public String getRESPONSIBLE_DEPT() {
+        return RESPONSIBLE_DEPT;
+    }
+
+    public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+        this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+    }
+
+    @Column(name="PLAN_NO")
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    @Column(name="INSPECTION_TYPE")
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    @Column(name="INSPECTION_MODE")
+    public String getINSPECTION_MODE() {
+        return INSPECTION_MODE;
+    }
+
+    public void setINSPECTION_MODE(String INSPECTION_MODE) {
+        this.INSPECTION_MODE = INSPECTION_MODE;
+    }
+
+    @Column(name="INSPECTION_ROUTE")
+    public String getINSPECTION_ROUTE() {
+        return INSPECTION_ROUTE;
+    }
+
+    public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+        this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+    }
+
+    @Column(name="INSPECTION_START_TIME")
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    @Column(name="INSPECTION_END_TIME")
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    @Column(name="INSPECTION_PRACE")
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    @Column(name="INSPECTION_GROUP")
+    public String getINSPECTION_GROUP() {
+        return INSPECTION_GROUP;
+    }
+
+    public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+        this.INSPECTION_GROUP = INSPECTION_GROUP;
+    }
+
+    @Column(name="INSERT_TIME")
+    public String getINSERT_TIME() {
+        return INSERT_TIME;
+    }
+
+    public void setINSERT_TIME(String INSERT_TIME) {
+        this.INSERT_TIME = INSERT_TIME;
+    }
+
+    @Column(name="FREQUENCYDATE")
+    public String getFREQUENCYDATE() {
+        return FREQUENCYDATE;
+    }
+
+    public void setFREQUENCYDATE(String FREQUENCYDATE) {
+        this.FREQUENCYDATE = FREQUENCYDATE;
+    }
+
+    @Column(name="FREQUENCYTIME")
+    public String getFREQUENCYTIME() {
+        return FREQUENCYTIME;
+    }
+
+    public void setFREQUENCYTIME(String FREQUENCYTIME) {
+        this.FREQUENCYTIME = FREQUENCYTIME;
+    }
+
+    @Column(name="CREATEDATE")
+    public String getCREATEDATE() {
+        return CREATEDATE;
+    }
+
+    public void setCREATEDATE(String CREATEDATE) {
+        this.CREATEDATE = CREATEDATE;
+    }
+
+    @Column(name="CREATOR")
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    @Column(name="PROJECT")
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    @Column(name="COMLILE")
+    public String getCOMLILE() {
+        return COMLILE;
+    }
+
+    public void setCOMLILE(String COMLILE) {
+        this.COMLILE = COMLILE;
+    }
+
+    @Column(name="START_TIME")
+    public String getSTART_TIME() {
+        return START_TIME;
+    }
+
+    public void setSTART_TIME(String START_TIME) {
+        this.START_TIME = START_TIME;
+    }
+
+    @Column(name="DEVELOP_DEPT")
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    @Column(name="END_TIME")
+    public String getEND_TIME() {
+        return END_TIME;
+    }
+
+    public void setEND_TIME(String END_TIME) {
+        this.END_TIME = END_TIME;
+    }
+
+    @Column(name="START_PILE_NO")
+    public String getSTART_PILE_NO() {
+        return START_PILE_NO;
+    }
+
+    public void setSTART_PILE_NO(String START_PILE_NO) {
+        this.START_PILE_NO = START_PILE_NO;
+    }
+
+    @Column(name="END_PILE_NO")
+    public String getEND_PILE_NO() {
+        return END_PILE_NO;
+    }
+
+    public void setEND_PILE_NO(String END_PILE_NO) {
+        this.END_PILE_NO = END_PILE_NO;
+    }
+
+    @Column(name="BUILD_CABIN")
+    public String getBUILD_CABIN() {
+        return BUILD_CABIN;
+    }
+
+    public void setBUILD_CABIN(String BUILD_CABIN) {
+        this.BUILD_CABIN = BUILD_CABIN;
+    }
+
+    @Column(name="MILEAGE")
+    public String getMILEAGE() {
+        return MILEAGE;
+    }
+
+    public void setMILEAGE(String MILEAGE) {
+        this.MILEAGE = MILEAGE;
+    }
+
+    @Column(name="FREQUENCY_TIME")
+    public String getFREQUENCY_TIME() {
+        return FREQUENCY_TIME;
+    }
+
+    public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+        this.FREQUENCY_TIME = FREQUENCY_TIME;
+    }
+
+    @Column(name="FREQUENCYTIME_END")
+    public String getFREQUENCYTIME_END() {
+        return FREQUENCYTIME_END;
+    }
+
+    public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+        this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+    }
+
+    @Column(name="KETTLE_TS")
+    public String getKETTLE_TS() {
+        return KETTLE_TS;
+    }
+
+    public void setKETTLE_TS(String KETTLE_TS) {
+        this.KETTLE_TS = KETTLE_TS;
+    }
+
+    @Column(name="UPDATEDATE")
+    public String getUPDATEDATE() {
+        return UPDATEDATE;
+    }
+
+    public void setUPDATEDATE(String UPDATEDATE) {
+        this.UPDATEDATE = UPDATEDATE;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 5346b57..2f8d359 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -66,7 +66,7 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REPAIRMAN")
+    @Column(name="REOAIRMAN")
     public String getRepairMan() {
         return repairMan;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
-    private Long id;
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-
-
-    public static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
-        PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
-        pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
-        pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
-        pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
-        pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
-        pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
-        pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
-        pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
-        pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
-        pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
-        pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
-        pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
-        pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
-        pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
-        pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
-        return pgAssetInSpectionRecordDto;
-    }
-
-
-    public static List<PgAssetInSpectionRecordDto> ConvertToDtoList(List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList){
-        List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-        for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
-            pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
-        }
-
-        return pgAssetInSpectionRecordDtoList;
-    }
-}

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ff69e2a..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,27 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190828.docx" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -32,72 +42,119 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="2" />
-          <entry key="java" value="243" />
-          <entry key="properties" value="6" />
+          <entry key="java" value="321" />
+          <entry key="properties" value="8" />
           <entry key="xml" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
-          <entry key="JAVA" value="243" />
-          <entry key="Properties" value="6" />
+          <entry key="JAVA" value="321" />
+          <entry key="Properties" value="8" />
           <entry key="XML" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="8082" />
-          <entry key="properties" value="49" />
-          <entry key="txt" value="64" />
+          <entry key="dummy" value="16" />
+          <entry key="java" value="10723" />
+          <entry key="properties" value="59" />
+          <entry key="txt" value="118" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="8082" />
-          <entry key="PLAIN_TEXT" value="64" />
-          <entry key="Properties" value="49" />
+          <entry key="JAVA" value="10723" />
+          <entry key="PLAIN_TEXT" value="134" />
+          <entry key="Properties" value="59" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="4" />
+          <entry key="project.closed" value="28" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
           <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.24" value="1" />
+          <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="1" />
-          <entry key="project.open.time.3" value="3" />
-          <entry key="project.open.time.31" value="1" />
+          <entry key="project.open.time.28" value="1" />
+          <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.31" value="2" />
           <entry key="project.open.time.37" value="1" />
+          <entry key="project.open.time.39" value="2" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.40" value="1" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="1" />
+          <entry key="project.open.time.44" value="2" />
           <entry key="project.open.time.45" value="2" />
           <entry key="project.open.time.48" value="1" />
           <entry key="project.open.time.49" value="1" />
+          <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.58" value="1" />
           <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.71" value="1" />
+          <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.71" value="2" />
           <entry key="project.open.time.76" value="1" />
-          <entry key="project.opened" value="25" />
+          <entry key="project.opened" value="41" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+            <state relative-caret-position="174">
+              <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
               <folding>
-                <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-                <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="352">
+              <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#787#788#0" expanded="true" />
+                <element signature="e#817#818#0" expanded="true" />
+                <element signature="e#2105#2106#0" expanded="true" />
+                <element signature="e#2135#2136#0" expanded="true" />
+                <element signature="e#2431#2432#0" expanded="true" />
+                <element signature="e#2461#2462#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="638">
+              <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+              <folding>
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -122,6 +179,7 @@
       <find>getPgDeviceByDevType</find>
       <find>message</find>
       <find>getConstructionByType</find>
+      <find>getPgCameraListByPosition</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -130,24 +188,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanTypeDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
@@ -162,17 +207,38 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
       </list>
     </option>
   </component>
@@ -208,16 +274,18 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="3" />
-    <option name="y" value="10" />
-    <option name="width" value="1386" />
-    <option name="height" value="788" />
+    <option name="x" value="1410" />
+    <option name="y" value="117" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -258,7 +326,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -267,16 +335,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -286,7 +345,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="dto" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -296,7 +355,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="manager" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -308,19 +367,10 @@
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="webapp" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -359,6 +409,7 @@
       </deployment>
       <server-settings>
         <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_7" />
+        <option name="JNDI_PORT" value="10991" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -456,7 +507,23 @@
       <workItem from="1566350810712" duration="6803000" />
       <workItem from="1566435787074" duration="10717000" />
       <workItem from="1566521753529" duration="14265000" />
-      <workItem from="1566614176989" duration="5693000" />
+      <workItem from="1566614176989" duration="14059000" />
+      <workItem from="1566780822009" duration="1026000" />
+      <workItem from="1566891563975" duration="284000" />
+      <workItem from="1566893107340" duration="3382000" />
+      <workItem from="1566953794976" duration="11039000" />
+      <workItem from="1567059357700" duration="484000" />
+      <workItem from="1567082835097" duration="1086000" />
+      <workItem from="1567126428020" duration="1539000" />
+      <workItem from="1567129277820" duration="5788000" />
+      <workItem from="1567136008996" duration="2568000" />
+      <workItem from="1567237040302" duration="111000" />
+      <workItem from="1567495626345" duration="2797000" />
+      <workItem from="1567558770152" duration="2352000" />
+      <workItem from="1567577368149" duration="640000" />
+      <workItem from="1567751224608" duration="780000" />
+      <workItem from="1568019299799" duration="695000" />
+      <workItem from="1568082566133" duration="4016000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -493,17 +560,60 @@
       <option name="project" value="LOCAL" />
       <updated>1566553388171</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="整理管线部分">
+      <created>1566620046627</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1566620046627</updated>
+    </task>
+    <task id="LOCAL-00007" summary="合并代码提交">
+      <created>1566781001910</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1566781001910</updated>
+    </task>
+    <task id="LOCAL-00008" summary="合并代码提交">
+      <created>1566963831930</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1566963831930</updated>
+    </task>
+    <task id="LOCAL-00009" summary="修改报警阈值">
+      <created>1566972146710</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1566972146710</updated>
+    </task>
+    <task id="LOCAL-00010" summary="修改巡检维护表字段">
+      <created>1567126525554</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1567126525554</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="142930000" />
+    <option name="totallyTimeSpent" value="189883000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
+    <frame x="1358" y="-8" width="1456" height="916" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29297996" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -511,13 +621,14 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Thumbnails" weight="0.3295082" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.5081967" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.3849105" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
       <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
       <window_info anchor="bottom" id="Spring" order="8" />
       <window_info anchor="bottom" id="Terminal" order="9" />
@@ -539,7 +650,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2193646" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -547,22 +658,23 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.47540984" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
-      <window_info anchor="bottom" id="Spring" order="8" />
-      <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
-      <window_info anchor="bottom" id="Statistic" order="11" />
-      <window_info anchor="bottom" id="Java Enterprise" order="12" />
-      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="14" weight="0.32786885" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.52307695" />
+      <window_info anchor="bottom" id="Thumbnails" order="0" weight="0.3295082" />
+      <window_info anchor="bottom" id="Message" order="1" />
+      <window_info anchor="bottom" id="Find" order="2" />
+      <window_info anchor="bottom" id="Run" order="3" />
+      <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.49924356" weight="0.49344262" />
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Application Servers" order="8" weight="0.3276923" />
+      <window_info anchor="bottom" id="Spring" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
+      <window_info anchor="bottom" id="Statistic" order="12" />
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <window_info anchor="bottom" id="Database Changes" order="14" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="15" weight="0.32786885" />
+      <window_info anchor="bottom" id="Messages" order="16" weight="0.5229508" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -578,6 +690,16 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -587,7 +709,11 @@
     <MESSAGE value="修改权限问题" />
     <MESSAGE value="修改人员登录返回接口" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整理管线部分" />
+    <MESSAGE value="合并代码提交" />
+    <MESSAGE value="修改报警阈值" />
+    <MESSAGE value="修改巡检维护表字段" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护表字段" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -602,322 +728,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-532">
-          <caret line="50" column="28" lean-forward="true" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="19" column="60" selection-start-line="19" selection-start-column="60" selection-end-line="19" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="100" column="34" lean-forward="true" selection-start-line="100" selection-start-column="34" selection-end-line="100" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1474">
-          <caret line="84" column="58" selection-start-line="84" selection-start-column="58" selection-end-line="84" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1100">
-          <caret line="58" column="18" selection-start-line="58" selection-start-column="18" selection-end-line="58" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6842">
-          <caret line="329" selection-start-line="329" selection-end-line="329" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="102" column="24" lean-forward="true" selection-start-line="102" selection-start-column="24" selection-end-line="102" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="72" column="56" lean-forward="true" selection-start-line="72" selection-start-column="56" selection-end-line="72" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="90" column="39" lean-forward="true" selection-start-line="90" selection-start-column="39" selection-end-line="90" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="97" column="16" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
-          <caret line="14" column="52" lean-forward="true" selection-start-line="14" selection-start-column="52" selection-end-line="14" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="26" column="34" lean-forward="true" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="61" column="1" lean-forward="true" selection-start-line="61" selection-start-column="1" selection-end-line="61" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="208" column="49" lean-forward="true" selection-start-line="208" selection-start-column="49" selection-end-line="208" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="140" column="57" selection-start-line="140" selection-start-column="57" selection-end-line="140" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="111" column="36" selection-start-line="111" selection-start-column="36" selection-end-line="111" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="3" lean-forward="true" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="81" column="58" lean-forward="true" selection-start-line="81" selection-start-column="58" selection-end-line="81" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="472">
-          <caret line="118" column="59" selection-start-line="118" selection-start-column="59" selection-end-line="118" selection-end-column="59" />
-          <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-198">
-          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="69" column="32" lean-forward="true" selection-start-line="69" selection-start-column="32" selection-end-line="70" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="142" column="59" lean-forward="true" selection-start-line="142" selection-start-column="59" selection-end-line="142" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="349" column="9" lean-forward="true" selection-start-line="349" selection-start-column="9" selection-end-line="349" selection-end-column="9" />
-          <folding>
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="e#12105#12121#0" expanded="true" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-686">
-          <caret line="67" column="31" lean-forward="true" selection-start-line="67" selection-start-column="31" selection-end-line="67" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="93" column="24" lean-forward="true" selection-start-line="93" selection-start-column="24" selection-end-line="93" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="57" column="23" lean-forward="true" selection-start-line="57" selection-start-column="23" selection-end-line="57" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-408">
-          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="98" column="40" lean-forward="true" selection-start-line="98" selection-start-column="40" selection-end-line="98" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="572">
@@ -925,13 +735,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="328" column="32" lean-forward="true" selection-start-line="328" selection-start-column="32" selection-end-line="328" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
@@ -950,16 +753,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="396">
           <caret line="23" column="32" lean-forward="true" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
-          <folding>
-            <element signature="e#2635#2636#0" expanded="true" />
-            <element signature="e#2671#2672#0" expanded="true" />
-            <element signature="e#2727#2728#0" expanded="true" />
-            <element signature="e#2777#2778#0" expanded="true" />
-            <element signature="e#2877#2878#0" expanded="true" />
-            <element signature="e#2911#2912#0" expanded="true" />
-            <element signature="e#2963#2964#0" expanded="true" />
-            <element signature="e#3009#3010#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -972,14 +765,481 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+        <state relative-caret-position="66">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="59" column="46" lean-forward="true" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3586">
+          <caret line="179" column="16" selection-start-line="179" selection-start-column="16" selection-end-line="179" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5478">
+          <caret line="273" column="3" selection-start-line="273" selection-start-column="3" selection-end-line="273" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1870">
+          <caret line="147" column="11" selection-start-line="147" selection-start-column="11" selection-end-line="147" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="55" column="15" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="106">
+          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="290" column="41" lean-forward="true" selection-start-line="290" selection-start-column="41" selection-end-line="290" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="21" column="32" lean-forward="true" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="550">
+          <caret line="38" column="89" selection-start-line="38" selection-start-column="89" selection-end-line="38" selection-end-column="89" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="11" column="28" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1166">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="818">
+          <caret line="285" column="13" lean-forward="true" selection-start-line="285" selection-start-column="13" selection-end-line="285" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="129" column="31" lean-forward="true" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="323" column="72" lean-forward="true" selection-start-line="323" selection-start-column="72" selection-end-line="323" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="44" column="13" lean-forward="true" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-638">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="244">
+          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="157">
+          <caret line="16" column="55" lean-forward="true" selection-start-line="16" selection-start-column="55" selection-end-line="16" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="270" column="33" lean-forward="true" selection-start-line="270" selection-start-column="33" selection-end-line="270" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="490">
+          <caret line="141" selection-start-line="141" selection-end-line="141" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="164" column="5" lean-forward="true" selection-start-line="164" selection-start-column="5" selection-end-line="164" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/apiTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-242">
+          <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="61" column="16" lean-forward="true" selection-start-line="61" selection-start-column="16" selection-end-line="61" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="700">
+          <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="12" column="34" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="39" column="9" lean-forward="true" selection-start-line="39" selection-start-column="9" selection-end-line="39" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="32" column="29" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="29" />
           <folding>
-            <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-            <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#1838#1839#0" expanded="true" />
+            <element signature="e#1863#1864#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1925#1926#0" expanded="true" />
+            <element signature="e#1822#1823#0" expanded="true" />
+            <element signature="e#1851#1852#0" expanded="true" />
+            <element signature="e#1895#1896#0" expanded="true" />
+            <element signature="e#1931#1932#0" expanded="true" />
+            <element signature="e#2132#2133#0" expanded="true" />
+            <element signature="e#2164#2165#0" expanded="true" />
+            <element signature="e#2214#2215#0" expanded="true" />
+            <element signature="e#2256#2257#0" expanded="true" />
+            <element signature="e#2330#2331#0" expanded="true" />
+            <element signature="e#2370#2371#0" expanded="true" />
+            <element signature="e#2436#2437#0" expanded="true" />
+            <element signature="e#2494#2495#0" expanded="true" />
+            <element signature="e#2569#2570#0" expanded="true" />
+            <element signature="e#2602#2603#0" expanded="true" />
+            <element signature="e#2654#2655#0" expanded="true" />
+            <element signature="e#2698#2699#0" expanded="true" />
+            <element signature="e#2764#2765#0" expanded="true" />
+            <element signature="e#2795#2796#0" expanded="true" />
+            <element signature="e#2843#2844#0" expanded="true" />
+            <element signature="e#2883#2884#0" expanded="true" />
+            <element signature="e#2948#2949#0" expanded="true" />
+            <element signature="e#2980#2981#0" expanded="true" />
+            <element signature="e#3030#3031#0" expanded="true" />
+            <element signature="e#3072#3073#0" expanded="true" />
+            <element signature="e#3134#3135#0" expanded="true" />
+            <element signature="e#3162#3163#0" expanded="true" />
+            <element signature="e#3204#3205#0" expanded="true" />
+            <element signature="e#3238#3239#0" expanded="true" />
+            <element signature="e#3307#3308#0" expanded="true" />
+            <element signature="e#3346#3347#0" expanded="true" />
+            <element signature="e#3410#3411#0" expanded="true" />
+            <element signature="e#3466#3467#0" expanded="true" />
+            <element signature="e#3537#3538#0" expanded="true" />
+            <element signature="e#3567#3568#0" expanded="true" />
+            <element signature="e#3613#3614#0" expanded="true" />
+            <element signature="e#3651#3652#0" expanded="true" />
+            <element signature="e#3721#3722#0" expanded="true" />
+            <element signature="e#3759#3760#0" expanded="true" />
+            <element signature="e#3821#3822#0" expanded="true" />
+            <element signature="e#3875#3876#0" expanded="true" />
+            <element signature="e#3953#3954#0" expanded="true" />
+            <element signature="e#3991#3992#0" expanded="true" />
+            <element signature="e#4053#4054#0" expanded="true" />
+            <element signature="e#4107#4108#0" expanded="true" />
+            <element signature="e#4186#4187#0" expanded="true" />
+            <element signature="e#4225#4226#0" expanded="true" />
+            <element signature="e#4289#4290#0" expanded="true" />
+            <element signature="e#4345#4346#0" expanded="true" />
+            <element signature="e#4430#4431#0" expanded="true" />
+            <element signature="e#4474#4475#0" expanded="true" />
+            <element signature="e#4698#4699#0" expanded="true" />
+            <element signature="e#4740#4741#0" expanded="true" />
+            <element signature="e#4810#4811#0" expanded="true" />
+            <element signature="e#4872#4873#0" expanded="true" />
+            <element signature="e#4955#4956#0" expanded="true" />
+            <element signature="e#4994#4995#0" expanded="true" />
+            <element signature="e#5058#5059#0" expanded="true" />
+            <element signature="e#5114#5115#0" expanded="true" />
+            <element signature="e#5194#5195#0" expanded="true" />
+            <element signature="e#5233#5234#0" expanded="true" />
+            <element signature="e#5297#5298#0" expanded="true" />
+            <element signature="e#5353#5354#0" expanded="true" />
+            <element signature="e#5428#5429#0" expanded="true" />
+            <element signature="e#5462#5463#0" expanded="true" />
+            <element signature="e#5516#5517#0" expanded="true" />
+            <element signature="e#5562#5563#0" expanded="true" />
+            <element signature="e#5634#5635#0" expanded="true" />
+            <element signature="e#5670#5671#0" expanded="true" />
+            <element signature="e#5728#5729#0" expanded="true" />
+            <element signature="e#5778#5779#0" expanded="true" />
+            <element signature="e#5852#5853#0" expanded="true" />
+            <element signature="e#5888#5889#0" expanded="true" />
+            <element signature="e#5946#5947#0" expanded="true" />
+            <element signature="e#5996#5997#0" expanded="true" />
+            <element signature="e#6067#6068#0" expanded="true" />
+            <element signature="e#6100#6101#0" expanded="true" />
+            <element signature="e#6152#6153#0" expanded="true" />
+            <element signature="e#6196#6197#0" expanded="true" />
+            <element signature="e#6261#6262#0" expanded="true" />
+            <element signature="e#6291#6292#0" expanded="true" />
+            <element signature="e#6337#6338#0" expanded="true" />
+            <element signature="e#6375#6376#0" expanded="true" />
+            <element signature="e#6437#6438#0" expanded="true" />
+            <element signature="e#6467#6468#0" expanded="true" />
+            <element signature="e#6513#6514#0" expanded="true" />
+            <element signature="e#6551#6552#0" expanded="true" />
+            <element signature="e#6613#6614#0" expanded="true" />
+            <element signature="e#6643#6644#0" expanded="true" />
+            <element signature="e#6689#6690#0" expanded="true" />
+            <element signature="e#6727#6728#0" expanded="true" />
+            <element signature="e#6796#6797#0" expanded="true" />
+            <element signature="e#6829#6830#0" expanded="true" />
+            <element signature="e#6881#6882#0" expanded="true" />
+            <element signature="e#6925#6926#0" expanded="true" />
+            <element signature="e#6995#6996#0" expanded="true" />
+            <element signature="e#7030#7031#0" expanded="true" />
+            <element signature="e#7086#7087#0" expanded="true" />
+            <element signature="e#7134#7135#0" expanded="true" />
+            <element signature="e#7202#7203#0" expanded="true" />
+            <element signature="e#7233#7234#0" expanded="true" />
+            <element signature="e#7281#7282#0" expanded="true" />
+            <element signature="e#7321#7322#0" expanded="true" />
+            <element signature="e#7390#7391#0" expanded="true" />
+            <element signature="e#7426#7427#0" expanded="true" />
+            <element signature="e#7484#7485#0" expanded="true" />
+            <element signature="e#7534#7535#0" expanded="true" />
+            <element signature="e#7602#7603#0" expanded="true" />
+            <element signature="e#7636#7637#0" expanded="true" />
+            <element signature="e#7690#7691#0" expanded="true" />
+            <element signature="e#7736#7737#0" expanded="true" />
+            <element signature="e#7806#7807#0" expanded="true" />
+            <element signature="e#7840#7841#0" expanded="true" />
+            <element signature="e#7894#7895#0" expanded="true" />
+            <element signature="e#7940#7941#0" expanded="true" />
+            <element signature="e#8006#8007#0" expanded="true" />
+            <element signature="e#8036#8037#0" expanded="true" />
+            <element signature="e#8082#8083#0" expanded="true" />
+            <element signature="e#8120#8121#0" expanded="true" />
+            <element signature="e#8189#8190#0" expanded="true" />
+            <element signature="e#8226#8227#0" expanded="true" />
+            <element signature="e#8286#8287#0" expanded="true" />
+            <element signature="e#8338#8339#0" expanded="true" />
+            <element signature="e#8417#8418#0" expanded="true" />
+            <element signature="e#8457#8458#0" expanded="true" />
+            <element signature="e#8523#8524#0" expanded="true" />
+            <element signature="e#8581#8582#0" expanded="true" />
+            <element signature="e#8655#8656#0" expanded="true" />
+            <element signature="e#8687#8688#0" expanded="true" />
+            <element signature="e#8737#8738#0" expanded="true" />
+            <element signature="e#8779#8780#0" expanded="true" />
+            <element signature="e#8846#8847#0" expanded="true" />
+            <element signature="e#8879#8880#0" expanded="true" />
+            <element signature="e#8931#8932#0" expanded="true" />
+            <element signature="e#8975#8976#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#787#788#0" expanded="true" />
+            <element signature="e#817#818#0" expanded="true" />
+            <element signature="e#2105#2106#0" expanded="true" />
+            <element signature="e#2135#2136#0" expanded="true" />
+            <element signature="e#2431#2432#0" expanded="true" />
+            <element signature="e#2461#2462#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index 854f1f1..0db633a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -165,12 +165,16 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String startDay,String endDay) {
+    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew) {
         try {
 
             Criteria criteria = createCriteria(PgAlarm.class);
             criteria.addOrder(Order.desc("id"));
 
+            if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) {
+                criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
+            }
+
             if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay))
             {
                 criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay)));
@@ -193,9 +197,11 @@
 
                 criteria.add(Restrictions.le("alarmDate",date));
             }
+            if(StringUtils.isNotBlank(isNew)&&isNew.equals("true"))
+                criteria.add(Restrictions.eq("active", 1));
 
             List<PgAlarm> pgAlarmList = criteria.list();
-            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
     }
 
     //根据设备位置(仓位)获取摄像机列表
-    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+    public List<PgDeviceDto> getPgCameraListByPosition(String partition,String position){
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.like("position",position+"%"));
-//        criteria.add(Restrictions.eq("devType","球机"));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(position))
+            criteria.add(Restrictions.like("position",position+"%"));
+
         criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
 
         List<PgDevice> pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
             dto.setDevCode(objects[5].toString());
             dto.setDevType(objects[6].toString());
             if(objects[7]!=null)
-            dto.setIp(objects[7].toString());
+                dto.setIp(objects[7].toString());
             dto.setIsOpen(objects[8].toString());
             dto.setPartition(objects[11].toString());
             dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index 8ebf74d..3c657a7 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgEquipment;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
 import com.casic.PgInterface.devTable.dto.PgEquipmentDto;
@@ -34,9 +35,12 @@
     public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
-        criteria.add(Restrictions.eq("eqName",eqName));
-        criteria.add(Restrictions.eq("eqCode",eqCode));
-        criteria.add(Restrictions.eq("eqType",eqType));
+        if(StringUtils.isNotBlank(eqName))
+            criteria.add(Restrictions.eq("eqName",eqName));
+        if(StringUtils.isNotBlank(eqCode))
+            criteria.add(Restrictions.eq("eqCode",eqCode));
+        if(StringUtils.isNotBlank(eqType))
+            criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
@@ -51,10 +55,9 @@
 
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
-        //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
         String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
-        +eqType+"' group by equipment.EQ_NAME";
+                +eqType+"' group by equipment.EQ_NAME";
 
         List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4ed68e4..e413a5c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
@@ -39,7 +40,8 @@
 
     public List<PgPipeLineDto> getPipeLineByLineType(String lineType) {
         Criteria criteria = createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineType", lineType));
+        if(StringUtils.isNotBlank(lineType))
+            criteria.add(Restrictions.eq("lineType", lineType));
 
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    private Long id;
-    private String keyId;//巡检记录单id
-    private String planId;//巡检计划ID
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    @Column(name="KEY_ID")
-    public String getKeyId() {
-        return keyId;
-    }
-
-    public void setKeyId(String keyId) {
-        this.keyId = keyId;
-    }
-
-    @Column(name="PLAN_ID")
-    public String getPlanId() {
-        return planId;
-    }
-
-    public void setPlanId(String planId) {
-        this.planId = planId;
-    }
-
-    @Column(name="CREATE_DATE")
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    @Column(name="STATE")
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    @Column(name="CREATOR")
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    @Column(name="PLAN_NAME")
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    @Column(name="RECORD_NO")
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    @Column(name="PLAN_NO")
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    @Column(name="RESPONSIBIE_DEPT")
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    @Column(name="INSPECTION_PERSON")
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    @Column(name="PATROL_MAN")
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    @Column(name="OPERATE_DATE")
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    @Column(name="REMARK")
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Column(name="BUILD_CABIN")
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    @Column(name="PROJECT")
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    @Column(name="START_PILE_NO")
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    @Column(name="END_PILE_NO")
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    @Column(name="INSPECTION_PRACE")
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    @Column(name="OTHER_PATROL_MAN")
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private Long id;
+    private String KEY_ID;//唯一键值
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_PERSON;//巡检人
+    private String START_DATE;//巡检开始时间
+    private String END_DATE;
+    private String FREQUENCY;//巡检频率
+    private String STATE;//状态
+    private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+    private String PLAN_NO;//巡检计划编号
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_MODE;//巡检方式
+    private String INSPECTION_ROUTE;//巡检路线
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String INSPECTION_GROUP;//巡检部门
+    private String INSERT_TIME;//插入时间
+    private String FREQUENCYDATE;//巡检具体日期
+    private String FREQUENCYTIME;//巡检具体时间
+    private String CREATEDATE;//创建时间
+    private String CREATOR;//创建人
+    private String PROJECT;//项目
+    private String COMLILE;//编制人
+    private String START_TIME;//编制时间
+    private String DEVELOP_DEPT;//制定部门
+    private String END_TIME;//结束时间
+    private String START_PILE_NO;//开始桩号
+    private String END_PILE_NO;//结束桩号
+    private String BUILD_CABIN;//巡检舱室
+    private String MILEAGE;
+    private String FREQUENCY_TIME;//巡检具体时间
+    private String FREQUENCYTIME_END;
+    private String KETTLE_TS;
+    private String UPDATEDATE;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="KEY_ID")
+    public String getKEY_ID() {
+        return KEY_ID;
+    }
+
+    public void setKEY_ID(String KEY_ID) {
+        this.KEY_ID = KEY_ID;
+    }
+
+    @Column(name="PLAN_NAME")
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    @Column(name="INSPECTION_PERSON")
+    public String getINSPECTION_PERSON() {
+        return INSPECTION_PERSON;
+    }
+
+    public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+        this.INSPECTION_PERSON = INSPECTION_PERSON;
+    }
+
+    @Column(name="START_DATE")
+    public String getSTART_DATE() {
+        return START_DATE;
+    }
+
+    public void setSTART_DATE(String START_DATE) {
+        this.START_DATE = START_DATE;
+    }
+
+    @Column(name="END_DATE")
+    public String getEND_DATE() {
+        return END_DATE;
+    }
+
+    public void setEND_DATE(String END_DATE) {
+        this.END_DATE = END_DATE;
+    }
+
+    @Column(name="FREQUENCY")
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    @Column(name="STATE")
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    @Column(name="RESPONSIBLE_DEPT")
+    public String getRESPONSIBLE_DEPT() {
+        return RESPONSIBLE_DEPT;
+    }
+
+    public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+        this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+    }
+
+    @Column(name="PLAN_NO")
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    @Column(name="INSPECTION_TYPE")
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    @Column(name="INSPECTION_MODE")
+    public String getINSPECTION_MODE() {
+        return INSPECTION_MODE;
+    }
+
+    public void setINSPECTION_MODE(String INSPECTION_MODE) {
+        this.INSPECTION_MODE = INSPECTION_MODE;
+    }
+
+    @Column(name="INSPECTION_ROUTE")
+    public String getINSPECTION_ROUTE() {
+        return INSPECTION_ROUTE;
+    }
+
+    public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+        this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+    }
+
+    @Column(name="INSPECTION_START_TIME")
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    @Column(name="INSPECTION_END_TIME")
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    @Column(name="INSPECTION_PRACE")
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    @Column(name="INSPECTION_GROUP")
+    public String getINSPECTION_GROUP() {
+        return INSPECTION_GROUP;
+    }
+
+    public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+        this.INSPECTION_GROUP = INSPECTION_GROUP;
+    }
+
+    @Column(name="INSERT_TIME")
+    public String getINSERT_TIME() {
+        return INSERT_TIME;
+    }
+
+    public void setINSERT_TIME(String INSERT_TIME) {
+        this.INSERT_TIME = INSERT_TIME;
+    }
+
+    @Column(name="FREQUENCYDATE")
+    public String getFREQUENCYDATE() {
+        return FREQUENCYDATE;
+    }
+
+    public void setFREQUENCYDATE(String FREQUENCYDATE) {
+        this.FREQUENCYDATE = FREQUENCYDATE;
+    }
+
+    @Column(name="FREQUENCYTIME")
+    public String getFREQUENCYTIME() {
+        return FREQUENCYTIME;
+    }
+
+    public void setFREQUENCYTIME(String FREQUENCYTIME) {
+        this.FREQUENCYTIME = FREQUENCYTIME;
+    }
+
+    @Column(name="CREATEDATE")
+    public String getCREATEDATE() {
+        return CREATEDATE;
+    }
+
+    public void setCREATEDATE(String CREATEDATE) {
+        this.CREATEDATE = CREATEDATE;
+    }
+
+    @Column(name="CREATOR")
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    @Column(name="PROJECT")
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    @Column(name="COMLILE")
+    public String getCOMLILE() {
+        return COMLILE;
+    }
+
+    public void setCOMLILE(String COMLILE) {
+        this.COMLILE = COMLILE;
+    }
+
+    @Column(name="START_TIME")
+    public String getSTART_TIME() {
+        return START_TIME;
+    }
+
+    public void setSTART_TIME(String START_TIME) {
+        this.START_TIME = START_TIME;
+    }
+
+    @Column(name="DEVELOP_DEPT")
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    @Column(name="END_TIME")
+    public String getEND_TIME() {
+        return END_TIME;
+    }
+
+    public void setEND_TIME(String END_TIME) {
+        this.END_TIME = END_TIME;
+    }
+
+    @Column(name="START_PILE_NO")
+    public String getSTART_PILE_NO() {
+        return START_PILE_NO;
+    }
+
+    public void setSTART_PILE_NO(String START_PILE_NO) {
+        this.START_PILE_NO = START_PILE_NO;
+    }
+
+    @Column(name="END_PILE_NO")
+    public String getEND_PILE_NO() {
+        return END_PILE_NO;
+    }
+
+    public void setEND_PILE_NO(String END_PILE_NO) {
+        this.END_PILE_NO = END_PILE_NO;
+    }
+
+    @Column(name="BUILD_CABIN")
+    public String getBUILD_CABIN() {
+        return BUILD_CABIN;
+    }
+
+    public void setBUILD_CABIN(String BUILD_CABIN) {
+        this.BUILD_CABIN = BUILD_CABIN;
+    }
+
+    @Column(name="MILEAGE")
+    public String getMILEAGE() {
+        return MILEAGE;
+    }
+
+    public void setMILEAGE(String MILEAGE) {
+        this.MILEAGE = MILEAGE;
+    }
+
+    @Column(name="FREQUENCY_TIME")
+    public String getFREQUENCY_TIME() {
+        return FREQUENCY_TIME;
+    }
+
+    public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+        this.FREQUENCY_TIME = FREQUENCY_TIME;
+    }
+
+    @Column(name="FREQUENCYTIME_END")
+    public String getFREQUENCYTIME_END() {
+        return FREQUENCYTIME_END;
+    }
+
+    public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+        this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+    }
+
+    @Column(name="KETTLE_TS")
+    public String getKETTLE_TS() {
+        return KETTLE_TS;
+    }
+
+    public void setKETTLE_TS(String KETTLE_TS) {
+        this.KETTLE_TS = KETTLE_TS;
+    }
+
+    @Column(name="UPDATEDATE")
+    public String getUPDATEDATE() {
+        return UPDATEDATE;
+    }
+
+    public void setUPDATEDATE(String UPDATEDATE) {
+        this.UPDATEDATE = UPDATEDATE;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 5346b57..2f8d359 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -66,7 +66,7 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REPAIRMAN")
+    @Column(name="REOAIRMAN")
     public String getRepairMan() {
         return repairMan;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
-    private Long id;
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-
-
-    public static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
-        PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
-        pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
-        pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
-        pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
-        pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
-        pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
-        pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
-        pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
-        pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
-        pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
-        pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
-        pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
-        pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
-        pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
-        pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
-        return pgAssetInSpectionRecordDto;
-    }
-
-
-    public static List<PgAssetInSpectionRecordDto> ConvertToDtoList(List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList){
-        List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-        for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
-            pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
-        }
-
-        return pgAssetInSpectionRecordDtoList;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
-    private String num;
-    private String createDate;
-
-    public String getNum() {
-        return num;
-    }
-
-    public void setNum(String num) {
-        this.num = num;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-}

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ff69e2a..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,27 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190828.docx" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -32,72 +42,119 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="2" />
-          <entry key="java" value="243" />
-          <entry key="properties" value="6" />
+          <entry key="java" value="321" />
+          <entry key="properties" value="8" />
           <entry key="xml" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
-          <entry key="JAVA" value="243" />
-          <entry key="Properties" value="6" />
+          <entry key="JAVA" value="321" />
+          <entry key="Properties" value="8" />
           <entry key="XML" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="8082" />
-          <entry key="properties" value="49" />
-          <entry key="txt" value="64" />
+          <entry key="dummy" value="16" />
+          <entry key="java" value="10723" />
+          <entry key="properties" value="59" />
+          <entry key="txt" value="118" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="8082" />
-          <entry key="PLAIN_TEXT" value="64" />
-          <entry key="Properties" value="49" />
+          <entry key="JAVA" value="10723" />
+          <entry key="PLAIN_TEXT" value="134" />
+          <entry key="Properties" value="59" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="4" />
+          <entry key="project.closed" value="28" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
           <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.24" value="1" />
+          <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="1" />
-          <entry key="project.open.time.3" value="3" />
-          <entry key="project.open.time.31" value="1" />
+          <entry key="project.open.time.28" value="1" />
+          <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.31" value="2" />
           <entry key="project.open.time.37" value="1" />
+          <entry key="project.open.time.39" value="2" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.40" value="1" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="1" />
+          <entry key="project.open.time.44" value="2" />
           <entry key="project.open.time.45" value="2" />
           <entry key="project.open.time.48" value="1" />
           <entry key="project.open.time.49" value="1" />
+          <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.58" value="1" />
           <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.71" value="1" />
+          <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.71" value="2" />
           <entry key="project.open.time.76" value="1" />
-          <entry key="project.opened" value="25" />
+          <entry key="project.opened" value="41" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+            <state relative-caret-position="174">
+              <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
               <folding>
-                <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-                <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="352">
+              <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#787#788#0" expanded="true" />
+                <element signature="e#817#818#0" expanded="true" />
+                <element signature="e#2105#2106#0" expanded="true" />
+                <element signature="e#2135#2136#0" expanded="true" />
+                <element signature="e#2431#2432#0" expanded="true" />
+                <element signature="e#2461#2462#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="638">
+              <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+              <folding>
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -122,6 +179,7 @@
       <find>getPgDeviceByDevType</find>
       <find>message</find>
       <find>getConstructionByType</find>
+      <find>getPgCameraListByPosition</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -130,24 +188,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanTypeDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
@@ -162,17 +207,38 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
       </list>
     </option>
   </component>
@@ -208,16 +274,18 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="3" />
-    <option name="y" value="10" />
-    <option name="width" value="1386" />
-    <option name="height" value="788" />
+    <option name="x" value="1410" />
+    <option name="y" value="117" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -258,7 +326,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -267,16 +335,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -286,7 +345,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="dto" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -296,7 +355,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="manager" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -308,19 +367,10 @@
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="webapp" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -359,6 +409,7 @@
       </deployment>
       <server-settings>
         <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_7" />
+        <option name="JNDI_PORT" value="10991" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -456,7 +507,23 @@
       <workItem from="1566350810712" duration="6803000" />
       <workItem from="1566435787074" duration="10717000" />
       <workItem from="1566521753529" duration="14265000" />
-      <workItem from="1566614176989" duration="5693000" />
+      <workItem from="1566614176989" duration="14059000" />
+      <workItem from="1566780822009" duration="1026000" />
+      <workItem from="1566891563975" duration="284000" />
+      <workItem from="1566893107340" duration="3382000" />
+      <workItem from="1566953794976" duration="11039000" />
+      <workItem from="1567059357700" duration="484000" />
+      <workItem from="1567082835097" duration="1086000" />
+      <workItem from="1567126428020" duration="1539000" />
+      <workItem from="1567129277820" duration="5788000" />
+      <workItem from="1567136008996" duration="2568000" />
+      <workItem from="1567237040302" duration="111000" />
+      <workItem from="1567495626345" duration="2797000" />
+      <workItem from="1567558770152" duration="2352000" />
+      <workItem from="1567577368149" duration="640000" />
+      <workItem from="1567751224608" duration="780000" />
+      <workItem from="1568019299799" duration="695000" />
+      <workItem from="1568082566133" duration="4016000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -493,17 +560,60 @@
       <option name="project" value="LOCAL" />
       <updated>1566553388171</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="整理管线部分">
+      <created>1566620046627</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1566620046627</updated>
+    </task>
+    <task id="LOCAL-00007" summary="合并代码提交">
+      <created>1566781001910</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1566781001910</updated>
+    </task>
+    <task id="LOCAL-00008" summary="合并代码提交">
+      <created>1566963831930</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1566963831930</updated>
+    </task>
+    <task id="LOCAL-00009" summary="修改报警阈值">
+      <created>1566972146710</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1566972146710</updated>
+    </task>
+    <task id="LOCAL-00010" summary="修改巡检维护表字段">
+      <created>1567126525554</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1567126525554</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="142930000" />
+    <option name="totallyTimeSpent" value="189883000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
+    <frame x="1358" y="-8" width="1456" height="916" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29297996" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -511,13 +621,14 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Thumbnails" weight="0.3295082" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.5081967" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.3849105" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
       <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
       <window_info anchor="bottom" id="Spring" order="8" />
       <window_info anchor="bottom" id="Terminal" order="9" />
@@ -539,7 +650,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2193646" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -547,22 +658,23 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.47540984" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
-      <window_info anchor="bottom" id="Spring" order="8" />
-      <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
-      <window_info anchor="bottom" id="Statistic" order="11" />
-      <window_info anchor="bottom" id="Java Enterprise" order="12" />
-      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="14" weight="0.32786885" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.52307695" />
+      <window_info anchor="bottom" id="Thumbnails" order="0" weight="0.3295082" />
+      <window_info anchor="bottom" id="Message" order="1" />
+      <window_info anchor="bottom" id="Find" order="2" />
+      <window_info anchor="bottom" id="Run" order="3" />
+      <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.49924356" weight="0.49344262" />
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Application Servers" order="8" weight="0.3276923" />
+      <window_info anchor="bottom" id="Spring" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
+      <window_info anchor="bottom" id="Statistic" order="12" />
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <window_info anchor="bottom" id="Database Changes" order="14" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="15" weight="0.32786885" />
+      <window_info anchor="bottom" id="Messages" order="16" weight="0.5229508" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -578,6 +690,16 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -587,7 +709,11 @@
     <MESSAGE value="修改权限问题" />
     <MESSAGE value="修改人员登录返回接口" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整理管线部分" />
+    <MESSAGE value="合并代码提交" />
+    <MESSAGE value="修改报警阈值" />
+    <MESSAGE value="修改巡检维护表字段" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护表字段" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -602,322 +728,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-532">
-          <caret line="50" column="28" lean-forward="true" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="19" column="60" selection-start-line="19" selection-start-column="60" selection-end-line="19" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="100" column="34" lean-forward="true" selection-start-line="100" selection-start-column="34" selection-end-line="100" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1474">
-          <caret line="84" column="58" selection-start-line="84" selection-start-column="58" selection-end-line="84" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1100">
-          <caret line="58" column="18" selection-start-line="58" selection-start-column="18" selection-end-line="58" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6842">
-          <caret line="329" selection-start-line="329" selection-end-line="329" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="102" column="24" lean-forward="true" selection-start-line="102" selection-start-column="24" selection-end-line="102" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="72" column="56" lean-forward="true" selection-start-line="72" selection-start-column="56" selection-end-line="72" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="90" column="39" lean-forward="true" selection-start-line="90" selection-start-column="39" selection-end-line="90" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="97" column="16" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
-          <caret line="14" column="52" lean-forward="true" selection-start-line="14" selection-start-column="52" selection-end-line="14" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="26" column="34" lean-forward="true" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="61" column="1" lean-forward="true" selection-start-line="61" selection-start-column="1" selection-end-line="61" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="208" column="49" lean-forward="true" selection-start-line="208" selection-start-column="49" selection-end-line="208" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="140" column="57" selection-start-line="140" selection-start-column="57" selection-end-line="140" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="111" column="36" selection-start-line="111" selection-start-column="36" selection-end-line="111" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="3" lean-forward="true" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="81" column="58" lean-forward="true" selection-start-line="81" selection-start-column="58" selection-end-line="81" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="472">
-          <caret line="118" column="59" selection-start-line="118" selection-start-column="59" selection-end-line="118" selection-end-column="59" />
-          <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-198">
-          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="69" column="32" lean-forward="true" selection-start-line="69" selection-start-column="32" selection-end-line="70" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="142" column="59" lean-forward="true" selection-start-line="142" selection-start-column="59" selection-end-line="142" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="349" column="9" lean-forward="true" selection-start-line="349" selection-start-column="9" selection-end-line="349" selection-end-column="9" />
-          <folding>
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="e#12105#12121#0" expanded="true" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-686">
-          <caret line="67" column="31" lean-forward="true" selection-start-line="67" selection-start-column="31" selection-end-line="67" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="93" column="24" lean-forward="true" selection-start-line="93" selection-start-column="24" selection-end-line="93" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="57" column="23" lean-forward="true" selection-start-line="57" selection-start-column="23" selection-end-line="57" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-408">
-          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="98" column="40" lean-forward="true" selection-start-line="98" selection-start-column="40" selection-end-line="98" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="572">
@@ -925,13 +735,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="328" column="32" lean-forward="true" selection-start-line="328" selection-start-column="32" selection-end-line="328" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
@@ -950,16 +753,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="396">
           <caret line="23" column="32" lean-forward="true" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
-          <folding>
-            <element signature="e#2635#2636#0" expanded="true" />
-            <element signature="e#2671#2672#0" expanded="true" />
-            <element signature="e#2727#2728#0" expanded="true" />
-            <element signature="e#2777#2778#0" expanded="true" />
-            <element signature="e#2877#2878#0" expanded="true" />
-            <element signature="e#2911#2912#0" expanded="true" />
-            <element signature="e#2963#2964#0" expanded="true" />
-            <element signature="e#3009#3010#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -972,14 +765,481 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+        <state relative-caret-position="66">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="59" column="46" lean-forward="true" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3586">
+          <caret line="179" column="16" selection-start-line="179" selection-start-column="16" selection-end-line="179" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5478">
+          <caret line="273" column="3" selection-start-line="273" selection-start-column="3" selection-end-line="273" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1870">
+          <caret line="147" column="11" selection-start-line="147" selection-start-column="11" selection-end-line="147" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="55" column="15" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="106">
+          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="290" column="41" lean-forward="true" selection-start-line="290" selection-start-column="41" selection-end-line="290" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="21" column="32" lean-forward="true" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="550">
+          <caret line="38" column="89" selection-start-line="38" selection-start-column="89" selection-end-line="38" selection-end-column="89" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="11" column="28" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1166">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="818">
+          <caret line="285" column="13" lean-forward="true" selection-start-line="285" selection-start-column="13" selection-end-line="285" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="129" column="31" lean-forward="true" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="323" column="72" lean-forward="true" selection-start-line="323" selection-start-column="72" selection-end-line="323" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="44" column="13" lean-forward="true" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-638">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="244">
+          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="157">
+          <caret line="16" column="55" lean-forward="true" selection-start-line="16" selection-start-column="55" selection-end-line="16" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="270" column="33" lean-forward="true" selection-start-line="270" selection-start-column="33" selection-end-line="270" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="490">
+          <caret line="141" selection-start-line="141" selection-end-line="141" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="164" column="5" lean-forward="true" selection-start-line="164" selection-start-column="5" selection-end-line="164" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/apiTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-242">
+          <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="61" column="16" lean-forward="true" selection-start-line="61" selection-start-column="16" selection-end-line="61" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="700">
+          <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="12" column="34" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="39" column="9" lean-forward="true" selection-start-line="39" selection-start-column="9" selection-end-line="39" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="32" column="29" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="29" />
           <folding>
-            <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-            <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#1838#1839#0" expanded="true" />
+            <element signature="e#1863#1864#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1925#1926#0" expanded="true" />
+            <element signature="e#1822#1823#0" expanded="true" />
+            <element signature="e#1851#1852#0" expanded="true" />
+            <element signature="e#1895#1896#0" expanded="true" />
+            <element signature="e#1931#1932#0" expanded="true" />
+            <element signature="e#2132#2133#0" expanded="true" />
+            <element signature="e#2164#2165#0" expanded="true" />
+            <element signature="e#2214#2215#0" expanded="true" />
+            <element signature="e#2256#2257#0" expanded="true" />
+            <element signature="e#2330#2331#0" expanded="true" />
+            <element signature="e#2370#2371#0" expanded="true" />
+            <element signature="e#2436#2437#0" expanded="true" />
+            <element signature="e#2494#2495#0" expanded="true" />
+            <element signature="e#2569#2570#0" expanded="true" />
+            <element signature="e#2602#2603#0" expanded="true" />
+            <element signature="e#2654#2655#0" expanded="true" />
+            <element signature="e#2698#2699#0" expanded="true" />
+            <element signature="e#2764#2765#0" expanded="true" />
+            <element signature="e#2795#2796#0" expanded="true" />
+            <element signature="e#2843#2844#0" expanded="true" />
+            <element signature="e#2883#2884#0" expanded="true" />
+            <element signature="e#2948#2949#0" expanded="true" />
+            <element signature="e#2980#2981#0" expanded="true" />
+            <element signature="e#3030#3031#0" expanded="true" />
+            <element signature="e#3072#3073#0" expanded="true" />
+            <element signature="e#3134#3135#0" expanded="true" />
+            <element signature="e#3162#3163#0" expanded="true" />
+            <element signature="e#3204#3205#0" expanded="true" />
+            <element signature="e#3238#3239#0" expanded="true" />
+            <element signature="e#3307#3308#0" expanded="true" />
+            <element signature="e#3346#3347#0" expanded="true" />
+            <element signature="e#3410#3411#0" expanded="true" />
+            <element signature="e#3466#3467#0" expanded="true" />
+            <element signature="e#3537#3538#0" expanded="true" />
+            <element signature="e#3567#3568#0" expanded="true" />
+            <element signature="e#3613#3614#0" expanded="true" />
+            <element signature="e#3651#3652#0" expanded="true" />
+            <element signature="e#3721#3722#0" expanded="true" />
+            <element signature="e#3759#3760#0" expanded="true" />
+            <element signature="e#3821#3822#0" expanded="true" />
+            <element signature="e#3875#3876#0" expanded="true" />
+            <element signature="e#3953#3954#0" expanded="true" />
+            <element signature="e#3991#3992#0" expanded="true" />
+            <element signature="e#4053#4054#0" expanded="true" />
+            <element signature="e#4107#4108#0" expanded="true" />
+            <element signature="e#4186#4187#0" expanded="true" />
+            <element signature="e#4225#4226#0" expanded="true" />
+            <element signature="e#4289#4290#0" expanded="true" />
+            <element signature="e#4345#4346#0" expanded="true" />
+            <element signature="e#4430#4431#0" expanded="true" />
+            <element signature="e#4474#4475#0" expanded="true" />
+            <element signature="e#4698#4699#0" expanded="true" />
+            <element signature="e#4740#4741#0" expanded="true" />
+            <element signature="e#4810#4811#0" expanded="true" />
+            <element signature="e#4872#4873#0" expanded="true" />
+            <element signature="e#4955#4956#0" expanded="true" />
+            <element signature="e#4994#4995#0" expanded="true" />
+            <element signature="e#5058#5059#0" expanded="true" />
+            <element signature="e#5114#5115#0" expanded="true" />
+            <element signature="e#5194#5195#0" expanded="true" />
+            <element signature="e#5233#5234#0" expanded="true" />
+            <element signature="e#5297#5298#0" expanded="true" />
+            <element signature="e#5353#5354#0" expanded="true" />
+            <element signature="e#5428#5429#0" expanded="true" />
+            <element signature="e#5462#5463#0" expanded="true" />
+            <element signature="e#5516#5517#0" expanded="true" />
+            <element signature="e#5562#5563#0" expanded="true" />
+            <element signature="e#5634#5635#0" expanded="true" />
+            <element signature="e#5670#5671#0" expanded="true" />
+            <element signature="e#5728#5729#0" expanded="true" />
+            <element signature="e#5778#5779#0" expanded="true" />
+            <element signature="e#5852#5853#0" expanded="true" />
+            <element signature="e#5888#5889#0" expanded="true" />
+            <element signature="e#5946#5947#0" expanded="true" />
+            <element signature="e#5996#5997#0" expanded="true" />
+            <element signature="e#6067#6068#0" expanded="true" />
+            <element signature="e#6100#6101#0" expanded="true" />
+            <element signature="e#6152#6153#0" expanded="true" />
+            <element signature="e#6196#6197#0" expanded="true" />
+            <element signature="e#6261#6262#0" expanded="true" />
+            <element signature="e#6291#6292#0" expanded="true" />
+            <element signature="e#6337#6338#0" expanded="true" />
+            <element signature="e#6375#6376#0" expanded="true" />
+            <element signature="e#6437#6438#0" expanded="true" />
+            <element signature="e#6467#6468#0" expanded="true" />
+            <element signature="e#6513#6514#0" expanded="true" />
+            <element signature="e#6551#6552#0" expanded="true" />
+            <element signature="e#6613#6614#0" expanded="true" />
+            <element signature="e#6643#6644#0" expanded="true" />
+            <element signature="e#6689#6690#0" expanded="true" />
+            <element signature="e#6727#6728#0" expanded="true" />
+            <element signature="e#6796#6797#0" expanded="true" />
+            <element signature="e#6829#6830#0" expanded="true" />
+            <element signature="e#6881#6882#0" expanded="true" />
+            <element signature="e#6925#6926#0" expanded="true" />
+            <element signature="e#6995#6996#0" expanded="true" />
+            <element signature="e#7030#7031#0" expanded="true" />
+            <element signature="e#7086#7087#0" expanded="true" />
+            <element signature="e#7134#7135#0" expanded="true" />
+            <element signature="e#7202#7203#0" expanded="true" />
+            <element signature="e#7233#7234#0" expanded="true" />
+            <element signature="e#7281#7282#0" expanded="true" />
+            <element signature="e#7321#7322#0" expanded="true" />
+            <element signature="e#7390#7391#0" expanded="true" />
+            <element signature="e#7426#7427#0" expanded="true" />
+            <element signature="e#7484#7485#0" expanded="true" />
+            <element signature="e#7534#7535#0" expanded="true" />
+            <element signature="e#7602#7603#0" expanded="true" />
+            <element signature="e#7636#7637#0" expanded="true" />
+            <element signature="e#7690#7691#0" expanded="true" />
+            <element signature="e#7736#7737#0" expanded="true" />
+            <element signature="e#7806#7807#0" expanded="true" />
+            <element signature="e#7840#7841#0" expanded="true" />
+            <element signature="e#7894#7895#0" expanded="true" />
+            <element signature="e#7940#7941#0" expanded="true" />
+            <element signature="e#8006#8007#0" expanded="true" />
+            <element signature="e#8036#8037#0" expanded="true" />
+            <element signature="e#8082#8083#0" expanded="true" />
+            <element signature="e#8120#8121#0" expanded="true" />
+            <element signature="e#8189#8190#0" expanded="true" />
+            <element signature="e#8226#8227#0" expanded="true" />
+            <element signature="e#8286#8287#0" expanded="true" />
+            <element signature="e#8338#8339#0" expanded="true" />
+            <element signature="e#8417#8418#0" expanded="true" />
+            <element signature="e#8457#8458#0" expanded="true" />
+            <element signature="e#8523#8524#0" expanded="true" />
+            <element signature="e#8581#8582#0" expanded="true" />
+            <element signature="e#8655#8656#0" expanded="true" />
+            <element signature="e#8687#8688#0" expanded="true" />
+            <element signature="e#8737#8738#0" expanded="true" />
+            <element signature="e#8779#8780#0" expanded="true" />
+            <element signature="e#8846#8847#0" expanded="true" />
+            <element signature="e#8879#8880#0" expanded="true" />
+            <element signature="e#8931#8932#0" expanded="true" />
+            <element signature="e#8975#8976#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#787#788#0" expanded="true" />
+            <element signature="e#817#818#0" expanded="true" />
+            <element signature="e#2105#2106#0" expanded="true" />
+            <element signature="e#2135#2136#0" expanded="true" />
+            <element signature="e#2431#2432#0" expanded="true" />
+            <element signature="e#2461#2462#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index 854f1f1..0db633a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -165,12 +165,16 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String startDay,String endDay) {
+    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew) {
         try {
 
             Criteria criteria = createCriteria(PgAlarm.class);
             criteria.addOrder(Order.desc("id"));
 
+            if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) {
+                criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
+            }
+
             if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay))
             {
                 criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay)));
@@ -193,9 +197,11 @@
 
                 criteria.add(Restrictions.le("alarmDate",date));
             }
+            if(StringUtils.isNotBlank(isNew)&&isNew.equals("true"))
+                criteria.add(Restrictions.eq("active", 1));
 
             List<PgAlarm> pgAlarmList = criteria.list();
-            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
     }
 
     //根据设备位置(仓位)获取摄像机列表
-    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+    public List<PgDeviceDto> getPgCameraListByPosition(String partition,String position){
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.like("position",position+"%"));
-//        criteria.add(Restrictions.eq("devType","球机"));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(position))
+            criteria.add(Restrictions.like("position",position+"%"));
+
         criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
 
         List<PgDevice> pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
             dto.setDevCode(objects[5].toString());
             dto.setDevType(objects[6].toString());
             if(objects[7]!=null)
-            dto.setIp(objects[7].toString());
+                dto.setIp(objects[7].toString());
             dto.setIsOpen(objects[8].toString());
             dto.setPartition(objects[11].toString());
             dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index 8ebf74d..3c657a7 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgEquipment;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
 import com.casic.PgInterface.devTable.dto.PgEquipmentDto;
@@ -34,9 +35,12 @@
     public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
-        criteria.add(Restrictions.eq("eqName",eqName));
-        criteria.add(Restrictions.eq("eqCode",eqCode));
-        criteria.add(Restrictions.eq("eqType",eqType));
+        if(StringUtils.isNotBlank(eqName))
+            criteria.add(Restrictions.eq("eqName",eqName));
+        if(StringUtils.isNotBlank(eqCode))
+            criteria.add(Restrictions.eq("eqCode",eqCode));
+        if(StringUtils.isNotBlank(eqType))
+            criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
@@ -51,10 +55,9 @@
 
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
-        //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
         String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
-        +eqType+"' group by equipment.EQ_NAME";
+                +eqType+"' group by equipment.EQ_NAME";
 
         List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4ed68e4..e413a5c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
@@ -39,7 +40,8 @@
 
     public List<PgPipeLineDto> getPipeLineByLineType(String lineType) {
         Criteria criteria = createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineType", lineType));
+        if(StringUtils.isNotBlank(lineType))
+            criteria.add(Restrictions.eq("lineType", lineType));
 
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    private Long id;
-    private String keyId;//巡检记录单id
-    private String planId;//巡检计划ID
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    @Column(name="KEY_ID")
-    public String getKeyId() {
-        return keyId;
-    }
-
-    public void setKeyId(String keyId) {
-        this.keyId = keyId;
-    }
-
-    @Column(name="PLAN_ID")
-    public String getPlanId() {
-        return planId;
-    }
-
-    public void setPlanId(String planId) {
-        this.planId = planId;
-    }
-
-    @Column(name="CREATE_DATE")
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    @Column(name="STATE")
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    @Column(name="CREATOR")
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    @Column(name="PLAN_NAME")
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    @Column(name="RECORD_NO")
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    @Column(name="PLAN_NO")
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    @Column(name="RESPONSIBIE_DEPT")
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    @Column(name="INSPECTION_PERSON")
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    @Column(name="PATROL_MAN")
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    @Column(name="OPERATE_DATE")
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    @Column(name="REMARK")
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Column(name="BUILD_CABIN")
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    @Column(name="PROJECT")
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    @Column(name="START_PILE_NO")
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    @Column(name="END_PILE_NO")
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    @Column(name="INSPECTION_PRACE")
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    @Column(name="OTHER_PATROL_MAN")
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private Long id;
+    private String KEY_ID;//唯一键值
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_PERSON;//巡检人
+    private String START_DATE;//巡检开始时间
+    private String END_DATE;
+    private String FREQUENCY;//巡检频率
+    private String STATE;//状态
+    private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+    private String PLAN_NO;//巡检计划编号
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_MODE;//巡检方式
+    private String INSPECTION_ROUTE;//巡检路线
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String INSPECTION_GROUP;//巡检部门
+    private String INSERT_TIME;//插入时间
+    private String FREQUENCYDATE;//巡检具体日期
+    private String FREQUENCYTIME;//巡检具体时间
+    private String CREATEDATE;//创建时间
+    private String CREATOR;//创建人
+    private String PROJECT;//项目
+    private String COMLILE;//编制人
+    private String START_TIME;//编制时间
+    private String DEVELOP_DEPT;//制定部门
+    private String END_TIME;//结束时间
+    private String START_PILE_NO;//开始桩号
+    private String END_PILE_NO;//结束桩号
+    private String BUILD_CABIN;//巡检舱室
+    private String MILEAGE;
+    private String FREQUENCY_TIME;//巡检具体时间
+    private String FREQUENCYTIME_END;
+    private String KETTLE_TS;
+    private String UPDATEDATE;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="KEY_ID")
+    public String getKEY_ID() {
+        return KEY_ID;
+    }
+
+    public void setKEY_ID(String KEY_ID) {
+        this.KEY_ID = KEY_ID;
+    }
+
+    @Column(name="PLAN_NAME")
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    @Column(name="INSPECTION_PERSON")
+    public String getINSPECTION_PERSON() {
+        return INSPECTION_PERSON;
+    }
+
+    public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+        this.INSPECTION_PERSON = INSPECTION_PERSON;
+    }
+
+    @Column(name="START_DATE")
+    public String getSTART_DATE() {
+        return START_DATE;
+    }
+
+    public void setSTART_DATE(String START_DATE) {
+        this.START_DATE = START_DATE;
+    }
+
+    @Column(name="END_DATE")
+    public String getEND_DATE() {
+        return END_DATE;
+    }
+
+    public void setEND_DATE(String END_DATE) {
+        this.END_DATE = END_DATE;
+    }
+
+    @Column(name="FREQUENCY")
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    @Column(name="STATE")
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    @Column(name="RESPONSIBLE_DEPT")
+    public String getRESPONSIBLE_DEPT() {
+        return RESPONSIBLE_DEPT;
+    }
+
+    public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+        this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+    }
+
+    @Column(name="PLAN_NO")
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    @Column(name="INSPECTION_TYPE")
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    @Column(name="INSPECTION_MODE")
+    public String getINSPECTION_MODE() {
+        return INSPECTION_MODE;
+    }
+
+    public void setINSPECTION_MODE(String INSPECTION_MODE) {
+        this.INSPECTION_MODE = INSPECTION_MODE;
+    }
+
+    @Column(name="INSPECTION_ROUTE")
+    public String getINSPECTION_ROUTE() {
+        return INSPECTION_ROUTE;
+    }
+
+    public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+        this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+    }
+
+    @Column(name="INSPECTION_START_TIME")
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    @Column(name="INSPECTION_END_TIME")
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    @Column(name="INSPECTION_PRACE")
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    @Column(name="INSPECTION_GROUP")
+    public String getINSPECTION_GROUP() {
+        return INSPECTION_GROUP;
+    }
+
+    public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+        this.INSPECTION_GROUP = INSPECTION_GROUP;
+    }
+
+    @Column(name="INSERT_TIME")
+    public String getINSERT_TIME() {
+        return INSERT_TIME;
+    }
+
+    public void setINSERT_TIME(String INSERT_TIME) {
+        this.INSERT_TIME = INSERT_TIME;
+    }
+
+    @Column(name="FREQUENCYDATE")
+    public String getFREQUENCYDATE() {
+        return FREQUENCYDATE;
+    }
+
+    public void setFREQUENCYDATE(String FREQUENCYDATE) {
+        this.FREQUENCYDATE = FREQUENCYDATE;
+    }
+
+    @Column(name="FREQUENCYTIME")
+    public String getFREQUENCYTIME() {
+        return FREQUENCYTIME;
+    }
+
+    public void setFREQUENCYTIME(String FREQUENCYTIME) {
+        this.FREQUENCYTIME = FREQUENCYTIME;
+    }
+
+    @Column(name="CREATEDATE")
+    public String getCREATEDATE() {
+        return CREATEDATE;
+    }
+
+    public void setCREATEDATE(String CREATEDATE) {
+        this.CREATEDATE = CREATEDATE;
+    }
+
+    @Column(name="CREATOR")
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    @Column(name="PROJECT")
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    @Column(name="COMLILE")
+    public String getCOMLILE() {
+        return COMLILE;
+    }
+
+    public void setCOMLILE(String COMLILE) {
+        this.COMLILE = COMLILE;
+    }
+
+    @Column(name="START_TIME")
+    public String getSTART_TIME() {
+        return START_TIME;
+    }
+
+    public void setSTART_TIME(String START_TIME) {
+        this.START_TIME = START_TIME;
+    }
+
+    @Column(name="DEVELOP_DEPT")
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    @Column(name="END_TIME")
+    public String getEND_TIME() {
+        return END_TIME;
+    }
+
+    public void setEND_TIME(String END_TIME) {
+        this.END_TIME = END_TIME;
+    }
+
+    @Column(name="START_PILE_NO")
+    public String getSTART_PILE_NO() {
+        return START_PILE_NO;
+    }
+
+    public void setSTART_PILE_NO(String START_PILE_NO) {
+        this.START_PILE_NO = START_PILE_NO;
+    }
+
+    @Column(name="END_PILE_NO")
+    public String getEND_PILE_NO() {
+        return END_PILE_NO;
+    }
+
+    public void setEND_PILE_NO(String END_PILE_NO) {
+        this.END_PILE_NO = END_PILE_NO;
+    }
+
+    @Column(name="BUILD_CABIN")
+    public String getBUILD_CABIN() {
+        return BUILD_CABIN;
+    }
+
+    public void setBUILD_CABIN(String BUILD_CABIN) {
+        this.BUILD_CABIN = BUILD_CABIN;
+    }
+
+    @Column(name="MILEAGE")
+    public String getMILEAGE() {
+        return MILEAGE;
+    }
+
+    public void setMILEAGE(String MILEAGE) {
+        this.MILEAGE = MILEAGE;
+    }
+
+    @Column(name="FREQUENCY_TIME")
+    public String getFREQUENCY_TIME() {
+        return FREQUENCY_TIME;
+    }
+
+    public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+        this.FREQUENCY_TIME = FREQUENCY_TIME;
+    }
+
+    @Column(name="FREQUENCYTIME_END")
+    public String getFREQUENCYTIME_END() {
+        return FREQUENCYTIME_END;
+    }
+
+    public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+        this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+    }
+
+    @Column(name="KETTLE_TS")
+    public String getKETTLE_TS() {
+        return KETTLE_TS;
+    }
+
+    public void setKETTLE_TS(String KETTLE_TS) {
+        this.KETTLE_TS = KETTLE_TS;
+    }
+
+    @Column(name="UPDATEDATE")
+    public String getUPDATEDATE() {
+        return UPDATEDATE;
+    }
+
+    public void setUPDATEDATE(String UPDATEDATE) {
+        this.UPDATEDATE = UPDATEDATE;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 5346b57..2f8d359 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -66,7 +66,7 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REPAIRMAN")
+    @Column(name="REOAIRMAN")
     public String getRepairMan() {
         return repairMan;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
-    private Long id;
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-
-
-    public static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
-        PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
-        pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
-        pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
-        pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
-        pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
-        pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
-        pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
-        pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
-        pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
-        pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
-        pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
-        pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
-        pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
-        pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
-        pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
-        return pgAssetInSpectionRecordDto;
-    }
-
-
-    public static List<PgAssetInSpectionRecordDto> ConvertToDtoList(List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList){
-        List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-        for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
-            pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
-        }
-
-        return pgAssetInSpectionRecordDtoList;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
-    private String num;
-    private String createDate;
-
-    public String getNum() {
-        return num;
-    }
-
-    public void setNum(String num) {
-        this.num = num;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+    private Long id;
+    private String PLAN_NO;//巡检计划编号
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String FREQUENCY;//巡检频率
+    private String CREATOR;//创建人
+    private String DEVELOP_DEPT;//制定部门
+    private String PROJECT;//项目
+    private String STATE;//状态
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+        PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+        pgAssetPlanDto.setId(pgAssetPlan.getId());
+        pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+        pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+        pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+        pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+        pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+        pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+        pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+        pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+        pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+        pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+        pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+        return pgAssetPlanDto;
+    }
+
+    public static List<PgAssetPlanDto> ConvertToPgAssetDtoList(List<PgAssetPlan> pgAssetPlanList){
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
+
+        for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+            pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+        }
+
+        return pgAssetPlanDtoList;
+    }
+
+}
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ff69e2a..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,27 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190828.docx" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -32,72 +42,119 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="2" />
-          <entry key="java" value="243" />
-          <entry key="properties" value="6" />
+          <entry key="java" value="321" />
+          <entry key="properties" value="8" />
           <entry key="xml" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
-          <entry key="JAVA" value="243" />
-          <entry key="Properties" value="6" />
+          <entry key="JAVA" value="321" />
+          <entry key="Properties" value="8" />
           <entry key="XML" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="8082" />
-          <entry key="properties" value="49" />
-          <entry key="txt" value="64" />
+          <entry key="dummy" value="16" />
+          <entry key="java" value="10723" />
+          <entry key="properties" value="59" />
+          <entry key="txt" value="118" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="8082" />
-          <entry key="PLAIN_TEXT" value="64" />
-          <entry key="Properties" value="49" />
+          <entry key="JAVA" value="10723" />
+          <entry key="PLAIN_TEXT" value="134" />
+          <entry key="Properties" value="59" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="4" />
+          <entry key="project.closed" value="28" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
           <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.24" value="1" />
+          <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="1" />
-          <entry key="project.open.time.3" value="3" />
-          <entry key="project.open.time.31" value="1" />
+          <entry key="project.open.time.28" value="1" />
+          <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.31" value="2" />
           <entry key="project.open.time.37" value="1" />
+          <entry key="project.open.time.39" value="2" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.40" value="1" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="1" />
+          <entry key="project.open.time.44" value="2" />
           <entry key="project.open.time.45" value="2" />
           <entry key="project.open.time.48" value="1" />
           <entry key="project.open.time.49" value="1" />
+          <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.58" value="1" />
           <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.71" value="1" />
+          <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.71" value="2" />
           <entry key="project.open.time.76" value="1" />
-          <entry key="project.opened" value="25" />
+          <entry key="project.opened" value="41" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+            <state relative-caret-position="174">
+              <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
               <folding>
-                <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-                <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="352">
+              <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#787#788#0" expanded="true" />
+                <element signature="e#817#818#0" expanded="true" />
+                <element signature="e#2105#2106#0" expanded="true" />
+                <element signature="e#2135#2136#0" expanded="true" />
+                <element signature="e#2431#2432#0" expanded="true" />
+                <element signature="e#2461#2462#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="638">
+              <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+              <folding>
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -122,6 +179,7 @@
       <find>getPgDeviceByDevType</find>
       <find>message</find>
       <find>getConstructionByType</find>
+      <find>getPgCameraListByPosition</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -130,24 +188,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanTypeDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
@@ -162,17 +207,38 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
       </list>
     </option>
   </component>
@@ -208,16 +274,18 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="3" />
-    <option name="y" value="10" />
-    <option name="width" value="1386" />
-    <option name="height" value="788" />
+    <option name="x" value="1410" />
+    <option name="y" value="117" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -258,7 +326,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -267,16 +335,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -286,7 +345,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="dto" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -296,7 +355,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="manager" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -308,19 +367,10 @@
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="webapp" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -359,6 +409,7 @@
       </deployment>
       <server-settings>
         <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_7" />
+        <option name="JNDI_PORT" value="10991" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -456,7 +507,23 @@
       <workItem from="1566350810712" duration="6803000" />
       <workItem from="1566435787074" duration="10717000" />
       <workItem from="1566521753529" duration="14265000" />
-      <workItem from="1566614176989" duration="5693000" />
+      <workItem from="1566614176989" duration="14059000" />
+      <workItem from="1566780822009" duration="1026000" />
+      <workItem from="1566891563975" duration="284000" />
+      <workItem from="1566893107340" duration="3382000" />
+      <workItem from="1566953794976" duration="11039000" />
+      <workItem from="1567059357700" duration="484000" />
+      <workItem from="1567082835097" duration="1086000" />
+      <workItem from="1567126428020" duration="1539000" />
+      <workItem from="1567129277820" duration="5788000" />
+      <workItem from="1567136008996" duration="2568000" />
+      <workItem from="1567237040302" duration="111000" />
+      <workItem from="1567495626345" duration="2797000" />
+      <workItem from="1567558770152" duration="2352000" />
+      <workItem from="1567577368149" duration="640000" />
+      <workItem from="1567751224608" duration="780000" />
+      <workItem from="1568019299799" duration="695000" />
+      <workItem from="1568082566133" duration="4016000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -493,17 +560,60 @@
       <option name="project" value="LOCAL" />
       <updated>1566553388171</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="整理管线部分">
+      <created>1566620046627</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1566620046627</updated>
+    </task>
+    <task id="LOCAL-00007" summary="合并代码提交">
+      <created>1566781001910</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1566781001910</updated>
+    </task>
+    <task id="LOCAL-00008" summary="合并代码提交">
+      <created>1566963831930</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1566963831930</updated>
+    </task>
+    <task id="LOCAL-00009" summary="修改报警阈值">
+      <created>1566972146710</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1566972146710</updated>
+    </task>
+    <task id="LOCAL-00010" summary="修改巡检维护表字段">
+      <created>1567126525554</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1567126525554</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="142930000" />
+    <option name="totallyTimeSpent" value="189883000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
+    <frame x="1358" y="-8" width="1456" height="916" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29297996" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -511,13 +621,14 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Thumbnails" weight="0.3295082" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.5081967" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.3849105" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
       <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
       <window_info anchor="bottom" id="Spring" order="8" />
       <window_info anchor="bottom" id="Terminal" order="9" />
@@ -539,7 +650,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2193646" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -547,22 +658,23 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.47540984" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
-      <window_info anchor="bottom" id="Spring" order="8" />
-      <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
-      <window_info anchor="bottom" id="Statistic" order="11" />
-      <window_info anchor="bottom" id="Java Enterprise" order="12" />
-      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="14" weight="0.32786885" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.52307695" />
+      <window_info anchor="bottom" id="Thumbnails" order="0" weight="0.3295082" />
+      <window_info anchor="bottom" id="Message" order="1" />
+      <window_info anchor="bottom" id="Find" order="2" />
+      <window_info anchor="bottom" id="Run" order="3" />
+      <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.49924356" weight="0.49344262" />
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Application Servers" order="8" weight="0.3276923" />
+      <window_info anchor="bottom" id="Spring" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
+      <window_info anchor="bottom" id="Statistic" order="12" />
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <window_info anchor="bottom" id="Database Changes" order="14" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="15" weight="0.32786885" />
+      <window_info anchor="bottom" id="Messages" order="16" weight="0.5229508" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -578,6 +690,16 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -587,7 +709,11 @@
     <MESSAGE value="修改权限问题" />
     <MESSAGE value="修改人员登录返回接口" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整理管线部分" />
+    <MESSAGE value="合并代码提交" />
+    <MESSAGE value="修改报警阈值" />
+    <MESSAGE value="修改巡检维护表字段" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护表字段" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -602,322 +728,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-532">
-          <caret line="50" column="28" lean-forward="true" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="19" column="60" selection-start-line="19" selection-start-column="60" selection-end-line="19" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="100" column="34" lean-forward="true" selection-start-line="100" selection-start-column="34" selection-end-line="100" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1474">
-          <caret line="84" column="58" selection-start-line="84" selection-start-column="58" selection-end-line="84" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1100">
-          <caret line="58" column="18" selection-start-line="58" selection-start-column="18" selection-end-line="58" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6842">
-          <caret line="329" selection-start-line="329" selection-end-line="329" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="102" column="24" lean-forward="true" selection-start-line="102" selection-start-column="24" selection-end-line="102" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="72" column="56" lean-forward="true" selection-start-line="72" selection-start-column="56" selection-end-line="72" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="90" column="39" lean-forward="true" selection-start-line="90" selection-start-column="39" selection-end-line="90" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="97" column="16" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
-          <caret line="14" column="52" lean-forward="true" selection-start-line="14" selection-start-column="52" selection-end-line="14" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="26" column="34" lean-forward="true" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="61" column="1" lean-forward="true" selection-start-line="61" selection-start-column="1" selection-end-line="61" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="208" column="49" lean-forward="true" selection-start-line="208" selection-start-column="49" selection-end-line="208" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="140" column="57" selection-start-line="140" selection-start-column="57" selection-end-line="140" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="111" column="36" selection-start-line="111" selection-start-column="36" selection-end-line="111" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="3" lean-forward="true" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="81" column="58" lean-forward="true" selection-start-line="81" selection-start-column="58" selection-end-line="81" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="472">
-          <caret line="118" column="59" selection-start-line="118" selection-start-column="59" selection-end-line="118" selection-end-column="59" />
-          <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-198">
-          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="69" column="32" lean-forward="true" selection-start-line="69" selection-start-column="32" selection-end-line="70" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="142" column="59" lean-forward="true" selection-start-line="142" selection-start-column="59" selection-end-line="142" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="349" column="9" lean-forward="true" selection-start-line="349" selection-start-column="9" selection-end-line="349" selection-end-column="9" />
-          <folding>
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="e#12105#12121#0" expanded="true" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-686">
-          <caret line="67" column="31" lean-forward="true" selection-start-line="67" selection-start-column="31" selection-end-line="67" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="93" column="24" lean-forward="true" selection-start-line="93" selection-start-column="24" selection-end-line="93" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="57" column="23" lean-forward="true" selection-start-line="57" selection-start-column="23" selection-end-line="57" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-408">
-          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="98" column="40" lean-forward="true" selection-start-line="98" selection-start-column="40" selection-end-line="98" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="572">
@@ -925,13 +735,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="328" column="32" lean-forward="true" selection-start-line="328" selection-start-column="32" selection-end-line="328" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
@@ -950,16 +753,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="396">
           <caret line="23" column="32" lean-forward="true" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
-          <folding>
-            <element signature="e#2635#2636#0" expanded="true" />
-            <element signature="e#2671#2672#0" expanded="true" />
-            <element signature="e#2727#2728#0" expanded="true" />
-            <element signature="e#2777#2778#0" expanded="true" />
-            <element signature="e#2877#2878#0" expanded="true" />
-            <element signature="e#2911#2912#0" expanded="true" />
-            <element signature="e#2963#2964#0" expanded="true" />
-            <element signature="e#3009#3010#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -972,14 +765,481 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+        <state relative-caret-position="66">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="59" column="46" lean-forward="true" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3586">
+          <caret line="179" column="16" selection-start-line="179" selection-start-column="16" selection-end-line="179" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5478">
+          <caret line="273" column="3" selection-start-line="273" selection-start-column="3" selection-end-line="273" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1870">
+          <caret line="147" column="11" selection-start-line="147" selection-start-column="11" selection-end-line="147" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="55" column="15" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="106">
+          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="290" column="41" lean-forward="true" selection-start-line="290" selection-start-column="41" selection-end-line="290" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="21" column="32" lean-forward="true" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="550">
+          <caret line="38" column="89" selection-start-line="38" selection-start-column="89" selection-end-line="38" selection-end-column="89" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="11" column="28" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1166">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="818">
+          <caret line="285" column="13" lean-forward="true" selection-start-line="285" selection-start-column="13" selection-end-line="285" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="129" column="31" lean-forward="true" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="323" column="72" lean-forward="true" selection-start-line="323" selection-start-column="72" selection-end-line="323" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="44" column="13" lean-forward="true" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-638">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="244">
+          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="157">
+          <caret line="16" column="55" lean-forward="true" selection-start-line="16" selection-start-column="55" selection-end-line="16" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="270" column="33" lean-forward="true" selection-start-line="270" selection-start-column="33" selection-end-line="270" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="490">
+          <caret line="141" selection-start-line="141" selection-end-line="141" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="164" column="5" lean-forward="true" selection-start-line="164" selection-start-column="5" selection-end-line="164" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/apiTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-242">
+          <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="61" column="16" lean-forward="true" selection-start-line="61" selection-start-column="16" selection-end-line="61" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="700">
+          <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="12" column="34" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="39" column="9" lean-forward="true" selection-start-line="39" selection-start-column="9" selection-end-line="39" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="32" column="29" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="29" />
           <folding>
-            <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-            <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#1838#1839#0" expanded="true" />
+            <element signature="e#1863#1864#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1925#1926#0" expanded="true" />
+            <element signature="e#1822#1823#0" expanded="true" />
+            <element signature="e#1851#1852#0" expanded="true" />
+            <element signature="e#1895#1896#0" expanded="true" />
+            <element signature="e#1931#1932#0" expanded="true" />
+            <element signature="e#2132#2133#0" expanded="true" />
+            <element signature="e#2164#2165#0" expanded="true" />
+            <element signature="e#2214#2215#0" expanded="true" />
+            <element signature="e#2256#2257#0" expanded="true" />
+            <element signature="e#2330#2331#0" expanded="true" />
+            <element signature="e#2370#2371#0" expanded="true" />
+            <element signature="e#2436#2437#0" expanded="true" />
+            <element signature="e#2494#2495#0" expanded="true" />
+            <element signature="e#2569#2570#0" expanded="true" />
+            <element signature="e#2602#2603#0" expanded="true" />
+            <element signature="e#2654#2655#0" expanded="true" />
+            <element signature="e#2698#2699#0" expanded="true" />
+            <element signature="e#2764#2765#0" expanded="true" />
+            <element signature="e#2795#2796#0" expanded="true" />
+            <element signature="e#2843#2844#0" expanded="true" />
+            <element signature="e#2883#2884#0" expanded="true" />
+            <element signature="e#2948#2949#0" expanded="true" />
+            <element signature="e#2980#2981#0" expanded="true" />
+            <element signature="e#3030#3031#0" expanded="true" />
+            <element signature="e#3072#3073#0" expanded="true" />
+            <element signature="e#3134#3135#0" expanded="true" />
+            <element signature="e#3162#3163#0" expanded="true" />
+            <element signature="e#3204#3205#0" expanded="true" />
+            <element signature="e#3238#3239#0" expanded="true" />
+            <element signature="e#3307#3308#0" expanded="true" />
+            <element signature="e#3346#3347#0" expanded="true" />
+            <element signature="e#3410#3411#0" expanded="true" />
+            <element signature="e#3466#3467#0" expanded="true" />
+            <element signature="e#3537#3538#0" expanded="true" />
+            <element signature="e#3567#3568#0" expanded="true" />
+            <element signature="e#3613#3614#0" expanded="true" />
+            <element signature="e#3651#3652#0" expanded="true" />
+            <element signature="e#3721#3722#0" expanded="true" />
+            <element signature="e#3759#3760#0" expanded="true" />
+            <element signature="e#3821#3822#0" expanded="true" />
+            <element signature="e#3875#3876#0" expanded="true" />
+            <element signature="e#3953#3954#0" expanded="true" />
+            <element signature="e#3991#3992#0" expanded="true" />
+            <element signature="e#4053#4054#0" expanded="true" />
+            <element signature="e#4107#4108#0" expanded="true" />
+            <element signature="e#4186#4187#0" expanded="true" />
+            <element signature="e#4225#4226#0" expanded="true" />
+            <element signature="e#4289#4290#0" expanded="true" />
+            <element signature="e#4345#4346#0" expanded="true" />
+            <element signature="e#4430#4431#0" expanded="true" />
+            <element signature="e#4474#4475#0" expanded="true" />
+            <element signature="e#4698#4699#0" expanded="true" />
+            <element signature="e#4740#4741#0" expanded="true" />
+            <element signature="e#4810#4811#0" expanded="true" />
+            <element signature="e#4872#4873#0" expanded="true" />
+            <element signature="e#4955#4956#0" expanded="true" />
+            <element signature="e#4994#4995#0" expanded="true" />
+            <element signature="e#5058#5059#0" expanded="true" />
+            <element signature="e#5114#5115#0" expanded="true" />
+            <element signature="e#5194#5195#0" expanded="true" />
+            <element signature="e#5233#5234#0" expanded="true" />
+            <element signature="e#5297#5298#0" expanded="true" />
+            <element signature="e#5353#5354#0" expanded="true" />
+            <element signature="e#5428#5429#0" expanded="true" />
+            <element signature="e#5462#5463#0" expanded="true" />
+            <element signature="e#5516#5517#0" expanded="true" />
+            <element signature="e#5562#5563#0" expanded="true" />
+            <element signature="e#5634#5635#0" expanded="true" />
+            <element signature="e#5670#5671#0" expanded="true" />
+            <element signature="e#5728#5729#0" expanded="true" />
+            <element signature="e#5778#5779#0" expanded="true" />
+            <element signature="e#5852#5853#0" expanded="true" />
+            <element signature="e#5888#5889#0" expanded="true" />
+            <element signature="e#5946#5947#0" expanded="true" />
+            <element signature="e#5996#5997#0" expanded="true" />
+            <element signature="e#6067#6068#0" expanded="true" />
+            <element signature="e#6100#6101#0" expanded="true" />
+            <element signature="e#6152#6153#0" expanded="true" />
+            <element signature="e#6196#6197#0" expanded="true" />
+            <element signature="e#6261#6262#0" expanded="true" />
+            <element signature="e#6291#6292#0" expanded="true" />
+            <element signature="e#6337#6338#0" expanded="true" />
+            <element signature="e#6375#6376#0" expanded="true" />
+            <element signature="e#6437#6438#0" expanded="true" />
+            <element signature="e#6467#6468#0" expanded="true" />
+            <element signature="e#6513#6514#0" expanded="true" />
+            <element signature="e#6551#6552#0" expanded="true" />
+            <element signature="e#6613#6614#0" expanded="true" />
+            <element signature="e#6643#6644#0" expanded="true" />
+            <element signature="e#6689#6690#0" expanded="true" />
+            <element signature="e#6727#6728#0" expanded="true" />
+            <element signature="e#6796#6797#0" expanded="true" />
+            <element signature="e#6829#6830#0" expanded="true" />
+            <element signature="e#6881#6882#0" expanded="true" />
+            <element signature="e#6925#6926#0" expanded="true" />
+            <element signature="e#6995#6996#0" expanded="true" />
+            <element signature="e#7030#7031#0" expanded="true" />
+            <element signature="e#7086#7087#0" expanded="true" />
+            <element signature="e#7134#7135#0" expanded="true" />
+            <element signature="e#7202#7203#0" expanded="true" />
+            <element signature="e#7233#7234#0" expanded="true" />
+            <element signature="e#7281#7282#0" expanded="true" />
+            <element signature="e#7321#7322#0" expanded="true" />
+            <element signature="e#7390#7391#0" expanded="true" />
+            <element signature="e#7426#7427#0" expanded="true" />
+            <element signature="e#7484#7485#0" expanded="true" />
+            <element signature="e#7534#7535#0" expanded="true" />
+            <element signature="e#7602#7603#0" expanded="true" />
+            <element signature="e#7636#7637#0" expanded="true" />
+            <element signature="e#7690#7691#0" expanded="true" />
+            <element signature="e#7736#7737#0" expanded="true" />
+            <element signature="e#7806#7807#0" expanded="true" />
+            <element signature="e#7840#7841#0" expanded="true" />
+            <element signature="e#7894#7895#0" expanded="true" />
+            <element signature="e#7940#7941#0" expanded="true" />
+            <element signature="e#8006#8007#0" expanded="true" />
+            <element signature="e#8036#8037#0" expanded="true" />
+            <element signature="e#8082#8083#0" expanded="true" />
+            <element signature="e#8120#8121#0" expanded="true" />
+            <element signature="e#8189#8190#0" expanded="true" />
+            <element signature="e#8226#8227#0" expanded="true" />
+            <element signature="e#8286#8287#0" expanded="true" />
+            <element signature="e#8338#8339#0" expanded="true" />
+            <element signature="e#8417#8418#0" expanded="true" />
+            <element signature="e#8457#8458#0" expanded="true" />
+            <element signature="e#8523#8524#0" expanded="true" />
+            <element signature="e#8581#8582#0" expanded="true" />
+            <element signature="e#8655#8656#0" expanded="true" />
+            <element signature="e#8687#8688#0" expanded="true" />
+            <element signature="e#8737#8738#0" expanded="true" />
+            <element signature="e#8779#8780#0" expanded="true" />
+            <element signature="e#8846#8847#0" expanded="true" />
+            <element signature="e#8879#8880#0" expanded="true" />
+            <element signature="e#8931#8932#0" expanded="true" />
+            <element signature="e#8975#8976#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#787#788#0" expanded="true" />
+            <element signature="e#817#818#0" expanded="true" />
+            <element signature="e#2105#2106#0" expanded="true" />
+            <element signature="e#2135#2136#0" expanded="true" />
+            <element signature="e#2431#2432#0" expanded="true" />
+            <element signature="e#2461#2462#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index 854f1f1..0db633a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -165,12 +165,16 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String startDay,String endDay) {
+    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew) {
         try {
 
             Criteria criteria = createCriteria(PgAlarm.class);
             criteria.addOrder(Order.desc("id"));
 
+            if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) {
+                criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
+            }
+
             if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay))
             {
                 criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay)));
@@ -193,9 +197,11 @@
 
                 criteria.add(Restrictions.le("alarmDate",date));
             }
+            if(StringUtils.isNotBlank(isNew)&&isNew.equals("true"))
+                criteria.add(Restrictions.eq("active", 1));
 
             List<PgAlarm> pgAlarmList = criteria.list();
-            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
     }
 
     //根据设备位置(仓位)获取摄像机列表
-    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+    public List<PgDeviceDto> getPgCameraListByPosition(String partition,String position){
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.like("position",position+"%"));
-//        criteria.add(Restrictions.eq("devType","球机"));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(position))
+            criteria.add(Restrictions.like("position",position+"%"));
+
         criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
 
         List<PgDevice> pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
             dto.setDevCode(objects[5].toString());
             dto.setDevType(objects[6].toString());
             if(objects[7]!=null)
-            dto.setIp(objects[7].toString());
+                dto.setIp(objects[7].toString());
             dto.setIsOpen(objects[8].toString());
             dto.setPartition(objects[11].toString());
             dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index 8ebf74d..3c657a7 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgEquipment;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
 import com.casic.PgInterface.devTable.dto.PgEquipmentDto;
@@ -34,9 +35,12 @@
     public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
-        criteria.add(Restrictions.eq("eqName",eqName));
-        criteria.add(Restrictions.eq("eqCode",eqCode));
-        criteria.add(Restrictions.eq("eqType",eqType));
+        if(StringUtils.isNotBlank(eqName))
+            criteria.add(Restrictions.eq("eqName",eqName));
+        if(StringUtils.isNotBlank(eqCode))
+            criteria.add(Restrictions.eq("eqCode",eqCode));
+        if(StringUtils.isNotBlank(eqType))
+            criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
@@ -51,10 +55,9 @@
 
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
-        //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
         String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
-        +eqType+"' group by equipment.EQ_NAME";
+                +eqType+"' group by equipment.EQ_NAME";
 
         List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4ed68e4..e413a5c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
@@ -39,7 +40,8 @@
 
     public List<PgPipeLineDto> getPipeLineByLineType(String lineType) {
         Criteria criteria = createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineType", lineType));
+        if(StringUtils.isNotBlank(lineType))
+            criteria.add(Restrictions.eq("lineType", lineType));
 
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    private Long id;
-    private String keyId;//巡检记录单id
-    private String planId;//巡检计划ID
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    @Column(name="KEY_ID")
-    public String getKeyId() {
-        return keyId;
-    }
-
-    public void setKeyId(String keyId) {
-        this.keyId = keyId;
-    }
-
-    @Column(name="PLAN_ID")
-    public String getPlanId() {
-        return planId;
-    }
-
-    public void setPlanId(String planId) {
-        this.planId = planId;
-    }
-
-    @Column(name="CREATE_DATE")
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    @Column(name="STATE")
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    @Column(name="CREATOR")
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    @Column(name="PLAN_NAME")
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    @Column(name="RECORD_NO")
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    @Column(name="PLAN_NO")
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    @Column(name="RESPONSIBIE_DEPT")
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    @Column(name="INSPECTION_PERSON")
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    @Column(name="PATROL_MAN")
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    @Column(name="OPERATE_DATE")
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    @Column(name="REMARK")
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Column(name="BUILD_CABIN")
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    @Column(name="PROJECT")
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    @Column(name="START_PILE_NO")
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    @Column(name="END_PILE_NO")
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    @Column(name="INSPECTION_PRACE")
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    @Column(name="OTHER_PATROL_MAN")
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private Long id;
+    private String KEY_ID;//唯一键值
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_PERSON;//巡检人
+    private String START_DATE;//巡检开始时间
+    private String END_DATE;
+    private String FREQUENCY;//巡检频率
+    private String STATE;//状态
+    private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+    private String PLAN_NO;//巡检计划编号
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_MODE;//巡检方式
+    private String INSPECTION_ROUTE;//巡检路线
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String INSPECTION_GROUP;//巡检部门
+    private String INSERT_TIME;//插入时间
+    private String FREQUENCYDATE;//巡检具体日期
+    private String FREQUENCYTIME;//巡检具体时间
+    private String CREATEDATE;//创建时间
+    private String CREATOR;//创建人
+    private String PROJECT;//项目
+    private String COMLILE;//编制人
+    private String START_TIME;//编制时间
+    private String DEVELOP_DEPT;//制定部门
+    private String END_TIME;//结束时间
+    private String START_PILE_NO;//开始桩号
+    private String END_PILE_NO;//结束桩号
+    private String BUILD_CABIN;//巡检舱室
+    private String MILEAGE;
+    private String FREQUENCY_TIME;//巡检具体时间
+    private String FREQUENCYTIME_END;
+    private String KETTLE_TS;
+    private String UPDATEDATE;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="KEY_ID")
+    public String getKEY_ID() {
+        return KEY_ID;
+    }
+
+    public void setKEY_ID(String KEY_ID) {
+        this.KEY_ID = KEY_ID;
+    }
+
+    @Column(name="PLAN_NAME")
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    @Column(name="INSPECTION_PERSON")
+    public String getINSPECTION_PERSON() {
+        return INSPECTION_PERSON;
+    }
+
+    public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+        this.INSPECTION_PERSON = INSPECTION_PERSON;
+    }
+
+    @Column(name="START_DATE")
+    public String getSTART_DATE() {
+        return START_DATE;
+    }
+
+    public void setSTART_DATE(String START_DATE) {
+        this.START_DATE = START_DATE;
+    }
+
+    @Column(name="END_DATE")
+    public String getEND_DATE() {
+        return END_DATE;
+    }
+
+    public void setEND_DATE(String END_DATE) {
+        this.END_DATE = END_DATE;
+    }
+
+    @Column(name="FREQUENCY")
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    @Column(name="STATE")
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    @Column(name="RESPONSIBLE_DEPT")
+    public String getRESPONSIBLE_DEPT() {
+        return RESPONSIBLE_DEPT;
+    }
+
+    public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+        this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+    }
+
+    @Column(name="PLAN_NO")
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    @Column(name="INSPECTION_TYPE")
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    @Column(name="INSPECTION_MODE")
+    public String getINSPECTION_MODE() {
+        return INSPECTION_MODE;
+    }
+
+    public void setINSPECTION_MODE(String INSPECTION_MODE) {
+        this.INSPECTION_MODE = INSPECTION_MODE;
+    }
+
+    @Column(name="INSPECTION_ROUTE")
+    public String getINSPECTION_ROUTE() {
+        return INSPECTION_ROUTE;
+    }
+
+    public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+        this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+    }
+
+    @Column(name="INSPECTION_START_TIME")
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    @Column(name="INSPECTION_END_TIME")
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    @Column(name="INSPECTION_PRACE")
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    @Column(name="INSPECTION_GROUP")
+    public String getINSPECTION_GROUP() {
+        return INSPECTION_GROUP;
+    }
+
+    public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+        this.INSPECTION_GROUP = INSPECTION_GROUP;
+    }
+
+    @Column(name="INSERT_TIME")
+    public String getINSERT_TIME() {
+        return INSERT_TIME;
+    }
+
+    public void setINSERT_TIME(String INSERT_TIME) {
+        this.INSERT_TIME = INSERT_TIME;
+    }
+
+    @Column(name="FREQUENCYDATE")
+    public String getFREQUENCYDATE() {
+        return FREQUENCYDATE;
+    }
+
+    public void setFREQUENCYDATE(String FREQUENCYDATE) {
+        this.FREQUENCYDATE = FREQUENCYDATE;
+    }
+
+    @Column(name="FREQUENCYTIME")
+    public String getFREQUENCYTIME() {
+        return FREQUENCYTIME;
+    }
+
+    public void setFREQUENCYTIME(String FREQUENCYTIME) {
+        this.FREQUENCYTIME = FREQUENCYTIME;
+    }
+
+    @Column(name="CREATEDATE")
+    public String getCREATEDATE() {
+        return CREATEDATE;
+    }
+
+    public void setCREATEDATE(String CREATEDATE) {
+        this.CREATEDATE = CREATEDATE;
+    }
+
+    @Column(name="CREATOR")
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    @Column(name="PROJECT")
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    @Column(name="COMLILE")
+    public String getCOMLILE() {
+        return COMLILE;
+    }
+
+    public void setCOMLILE(String COMLILE) {
+        this.COMLILE = COMLILE;
+    }
+
+    @Column(name="START_TIME")
+    public String getSTART_TIME() {
+        return START_TIME;
+    }
+
+    public void setSTART_TIME(String START_TIME) {
+        this.START_TIME = START_TIME;
+    }
+
+    @Column(name="DEVELOP_DEPT")
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    @Column(name="END_TIME")
+    public String getEND_TIME() {
+        return END_TIME;
+    }
+
+    public void setEND_TIME(String END_TIME) {
+        this.END_TIME = END_TIME;
+    }
+
+    @Column(name="START_PILE_NO")
+    public String getSTART_PILE_NO() {
+        return START_PILE_NO;
+    }
+
+    public void setSTART_PILE_NO(String START_PILE_NO) {
+        this.START_PILE_NO = START_PILE_NO;
+    }
+
+    @Column(name="END_PILE_NO")
+    public String getEND_PILE_NO() {
+        return END_PILE_NO;
+    }
+
+    public void setEND_PILE_NO(String END_PILE_NO) {
+        this.END_PILE_NO = END_PILE_NO;
+    }
+
+    @Column(name="BUILD_CABIN")
+    public String getBUILD_CABIN() {
+        return BUILD_CABIN;
+    }
+
+    public void setBUILD_CABIN(String BUILD_CABIN) {
+        this.BUILD_CABIN = BUILD_CABIN;
+    }
+
+    @Column(name="MILEAGE")
+    public String getMILEAGE() {
+        return MILEAGE;
+    }
+
+    public void setMILEAGE(String MILEAGE) {
+        this.MILEAGE = MILEAGE;
+    }
+
+    @Column(name="FREQUENCY_TIME")
+    public String getFREQUENCY_TIME() {
+        return FREQUENCY_TIME;
+    }
+
+    public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+        this.FREQUENCY_TIME = FREQUENCY_TIME;
+    }
+
+    @Column(name="FREQUENCYTIME_END")
+    public String getFREQUENCYTIME_END() {
+        return FREQUENCYTIME_END;
+    }
+
+    public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+        this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+    }
+
+    @Column(name="KETTLE_TS")
+    public String getKETTLE_TS() {
+        return KETTLE_TS;
+    }
+
+    public void setKETTLE_TS(String KETTLE_TS) {
+        this.KETTLE_TS = KETTLE_TS;
+    }
+
+    @Column(name="UPDATEDATE")
+    public String getUPDATEDATE() {
+        return UPDATEDATE;
+    }
+
+    public void setUPDATEDATE(String UPDATEDATE) {
+        this.UPDATEDATE = UPDATEDATE;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 5346b57..2f8d359 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -66,7 +66,7 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REPAIRMAN")
+    @Column(name="REOAIRMAN")
     public String getRepairMan() {
         return repairMan;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
-    private Long id;
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-
-
-    public static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
-        PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
-        pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
-        pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
-        pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
-        pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
-        pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
-        pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
-        pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
-        pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
-        pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
-        pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
-        pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
-        pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
-        pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
-        pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
-        return pgAssetInSpectionRecordDto;
-    }
-
-
-    public static List<PgAssetInSpectionRecordDto> ConvertToDtoList(List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList){
-        List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-        for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
-            pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
-        }
-
-        return pgAssetInSpectionRecordDtoList;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
-    private String num;
-    private String createDate;
-
-    public String getNum() {
-        return num;
-    }
-
-    public void setNum(String num) {
-        this.num = num;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+    private Long id;
+    private String PLAN_NO;//巡检计划编号
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String FREQUENCY;//巡检频率
+    private String CREATOR;//创建人
+    private String DEVELOP_DEPT;//制定部门
+    private String PROJECT;//项目
+    private String STATE;//状态
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+        PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+        pgAssetPlanDto.setId(pgAssetPlan.getId());
+        pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+        pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+        pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+        pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+        pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+        pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+        pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+        pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+        pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+        pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+        pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+        return pgAssetPlanDto;
+    }
+
+    public static List<PgAssetPlanDto> ConvertToPgAssetDtoList(List<PgAssetPlan> pgAssetPlanList){
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
+
+        for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+            pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+        }
+
+        return pgAssetPlanDtoList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
new file mode 100644
index 0000000..bc12db1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
@@ -0,0 +1,24 @@
+package com.casic.PgInterface.maintenance.dto;
+
+public class PgAssetPlanStatic {
+
+    private String num;
+    private String createDate;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+}

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ff69e2a..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,27 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190828.docx" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -32,72 +42,119 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="2" />
-          <entry key="java" value="243" />
-          <entry key="properties" value="6" />
+          <entry key="java" value="321" />
+          <entry key="properties" value="8" />
           <entry key="xml" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
-          <entry key="JAVA" value="243" />
-          <entry key="Properties" value="6" />
+          <entry key="JAVA" value="321" />
+          <entry key="Properties" value="8" />
           <entry key="XML" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="8082" />
-          <entry key="properties" value="49" />
-          <entry key="txt" value="64" />
+          <entry key="dummy" value="16" />
+          <entry key="java" value="10723" />
+          <entry key="properties" value="59" />
+          <entry key="txt" value="118" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="8082" />
-          <entry key="PLAIN_TEXT" value="64" />
-          <entry key="Properties" value="49" />
+          <entry key="JAVA" value="10723" />
+          <entry key="PLAIN_TEXT" value="134" />
+          <entry key="Properties" value="59" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="4" />
+          <entry key="project.closed" value="28" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
           <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.24" value="1" />
+          <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="1" />
-          <entry key="project.open.time.3" value="3" />
-          <entry key="project.open.time.31" value="1" />
+          <entry key="project.open.time.28" value="1" />
+          <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.31" value="2" />
           <entry key="project.open.time.37" value="1" />
+          <entry key="project.open.time.39" value="2" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.40" value="1" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="1" />
+          <entry key="project.open.time.44" value="2" />
           <entry key="project.open.time.45" value="2" />
           <entry key="project.open.time.48" value="1" />
           <entry key="project.open.time.49" value="1" />
+          <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.58" value="1" />
           <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.71" value="1" />
+          <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.71" value="2" />
           <entry key="project.open.time.76" value="1" />
-          <entry key="project.opened" value="25" />
+          <entry key="project.opened" value="41" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+            <state relative-caret-position="174">
+              <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
               <folding>
-                <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-                <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="352">
+              <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#787#788#0" expanded="true" />
+                <element signature="e#817#818#0" expanded="true" />
+                <element signature="e#2105#2106#0" expanded="true" />
+                <element signature="e#2135#2136#0" expanded="true" />
+                <element signature="e#2431#2432#0" expanded="true" />
+                <element signature="e#2461#2462#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="638">
+              <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+              <folding>
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -122,6 +179,7 @@
       <find>getPgDeviceByDevType</find>
       <find>message</find>
       <find>getConstructionByType</find>
+      <find>getPgCameraListByPosition</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -130,24 +188,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanTypeDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
@@ -162,17 +207,38 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
       </list>
     </option>
   </component>
@@ -208,16 +274,18 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="3" />
-    <option name="y" value="10" />
-    <option name="width" value="1386" />
-    <option name="height" value="788" />
+    <option name="x" value="1410" />
+    <option name="y" value="117" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -258,7 +326,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -267,16 +335,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -286,7 +345,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="dto" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -296,7 +355,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="manager" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -308,19 +367,10 @@
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="webapp" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -359,6 +409,7 @@
       </deployment>
       <server-settings>
         <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_7" />
+        <option name="JNDI_PORT" value="10991" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -456,7 +507,23 @@
       <workItem from="1566350810712" duration="6803000" />
       <workItem from="1566435787074" duration="10717000" />
       <workItem from="1566521753529" duration="14265000" />
-      <workItem from="1566614176989" duration="5693000" />
+      <workItem from="1566614176989" duration="14059000" />
+      <workItem from="1566780822009" duration="1026000" />
+      <workItem from="1566891563975" duration="284000" />
+      <workItem from="1566893107340" duration="3382000" />
+      <workItem from="1566953794976" duration="11039000" />
+      <workItem from="1567059357700" duration="484000" />
+      <workItem from="1567082835097" duration="1086000" />
+      <workItem from="1567126428020" duration="1539000" />
+      <workItem from="1567129277820" duration="5788000" />
+      <workItem from="1567136008996" duration="2568000" />
+      <workItem from="1567237040302" duration="111000" />
+      <workItem from="1567495626345" duration="2797000" />
+      <workItem from="1567558770152" duration="2352000" />
+      <workItem from="1567577368149" duration="640000" />
+      <workItem from="1567751224608" duration="780000" />
+      <workItem from="1568019299799" duration="695000" />
+      <workItem from="1568082566133" duration="4016000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -493,17 +560,60 @@
       <option name="project" value="LOCAL" />
       <updated>1566553388171</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="整理管线部分">
+      <created>1566620046627</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1566620046627</updated>
+    </task>
+    <task id="LOCAL-00007" summary="合并代码提交">
+      <created>1566781001910</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1566781001910</updated>
+    </task>
+    <task id="LOCAL-00008" summary="合并代码提交">
+      <created>1566963831930</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1566963831930</updated>
+    </task>
+    <task id="LOCAL-00009" summary="修改报警阈值">
+      <created>1566972146710</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1566972146710</updated>
+    </task>
+    <task id="LOCAL-00010" summary="修改巡检维护表字段">
+      <created>1567126525554</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1567126525554</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="142930000" />
+    <option name="totallyTimeSpent" value="189883000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
+    <frame x="1358" y="-8" width="1456" height="916" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29297996" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -511,13 +621,14 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Thumbnails" weight="0.3295082" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.5081967" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.3849105" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
       <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
       <window_info anchor="bottom" id="Spring" order="8" />
       <window_info anchor="bottom" id="Terminal" order="9" />
@@ -539,7 +650,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2193646" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -547,22 +658,23 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.47540984" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
-      <window_info anchor="bottom" id="Spring" order="8" />
-      <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
-      <window_info anchor="bottom" id="Statistic" order="11" />
-      <window_info anchor="bottom" id="Java Enterprise" order="12" />
-      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="14" weight="0.32786885" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.52307695" />
+      <window_info anchor="bottom" id="Thumbnails" order="0" weight="0.3295082" />
+      <window_info anchor="bottom" id="Message" order="1" />
+      <window_info anchor="bottom" id="Find" order="2" />
+      <window_info anchor="bottom" id="Run" order="3" />
+      <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.49924356" weight="0.49344262" />
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Application Servers" order="8" weight="0.3276923" />
+      <window_info anchor="bottom" id="Spring" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
+      <window_info anchor="bottom" id="Statistic" order="12" />
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <window_info anchor="bottom" id="Database Changes" order="14" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="15" weight="0.32786885" />
+      <window_info anchor="bottom" id="Messages" order="16" weight="0.5229508" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -578,6 +690,16 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -587,7 +709,11 @@
     <MESSAGE value="修改权限问题" />
     <MESSAGE value="修改人员登录返回接口" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整理管线部分" />
+    <MESSAGE value="合并代码提交" />
+    <MESSAGE value="修改报警阈值" />
+    <MESSAGE value="修改巡检维护表字段" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护表字段" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -602,322 +728,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-532">
-          <caret line="50" column="28" lean-forward="true" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="19" column="60" selection-start-line="19" selection-start-column="60" selection-end-line="19" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="100" column="34" lean-forward="true" selection-start-line="100" selection-start-column="34" selection-end-line="100" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1474">
-          <caret line="84" column="58" selection-start-line="84" selection-start-column="58" selection-end-line="84" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1100">
-          <caret line="58" column="18" selection-start-line="58" selection-start-column="18" selection-end-line="58" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6842">
-          <caret line="329" selection-start-line="329" selection-end-line="329" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="102" column="24" lean-forward="true" selection-start-line="102" selection-start-column="24" selection-end-line="102" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="72" column="56" lean-forward="true" selection-start-line="72" selection-start-column="56" selection-end-line="72" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="90" column="39" lean-forward="true" selection-start-line="90" selection-start-column="39" selection-end-line="90" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="97" column="16" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
-          <caret line="14" column="52" lean-forward="true" selection-start-line="14" selection-start-column="52" selection-end-line="14" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="26" column="34" lean-forward="true" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="61" column="1" lean-forward="true" selection-start-line="61" selection-start-column="1" selection-end-line="61" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="208" column="49" lean-forward="true" selection-start-line="208" selection-start-column="49" selection-end-line="208" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="140" column="57" selection-start-line="140" selection-start-column="57" selection-end-line="140" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="111" column="36" selection-start-line="111" selection-start-column="36" selection-end-line="111" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="3" lean-forward="true" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="81" column="58" lean-forward="true" selection-start-line="81" selection-start-column="58" selection-end-line="81" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="472">
-          <caret line="118" column="59" selection-start-line="118" selection-start-column="59" selection-end-line="118" selection-end-column="59" />
-          <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-198">
-          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="69" column="32" lean-forward="true" selection-start-line="69" selection-start-column="32" selection-end-line="70" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="142" column="59" lean-forward="true" selection-start-line="142" selection-start-column="59" selection-end-line="142" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="349" column="9" lean-forward="true" selection-start-line="349" selection-start-column="9" selection-end-line="349" selection-end-column="9" />
-          <folding>
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="e#12105#12121#0" expanded="true" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-686">
-          <caret line="67" column="31" lean-forward="true" selection-start-line="67" selection-start-column="31" selection-end-line="67" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="93" column="24" lean-forward="true" selection-start-line="93" selection-start-column="24" selection-end-line="93" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="57" column="23" lean-forward="true" selection-start-line="57" selection-start-column="23" selection-end-line="57" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-408">
-          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="98" column="40" lean-forward="true" selection-start-line="98" selection-start-column="40" selection-end-line="98" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="572">
@@ -925,13 +735,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="328" column="32" lean-forward="true" selection-start-line="328" selection-start-column="32" selection-end-line="328" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
@@ -950,16 +753,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="396">
           <caret line="23" column="32" lean-forward="true" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
-          <folding>
-            <element signature="e#2635#2636#0" expanded="true" />
-            <element signature="e#2671#2672#0" expanded="true" />
-            <element signature="e#2727#2728#0" expanded="true" />
-            <element signature="e#2777#2778#0" expanded="true" />
-            <element signature="e#2877#2878#0" expanded="true" />
-            <element signature="e#2911#2912#0" expanded="true" />
-            <element signature="e#2963#2964#0" expanded="true" />
-            <element signature="e#3009#3010#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -972,14 +765,481 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+        <state relative-caret-position="66">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="59" column="46" lean-forward="true" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3586">
+          <caret line="179" column="16" selection-start-line="179" selection-start-column="16" selection-end-line="179" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5478">
+          <caret line="273" column="3" selection-start-line="273" selection-start-column="3" selection-end-line="273" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1870">
+          <caret line="147" column="11" selection-start-line="147" selection-start-column="11" selection-end-line="147" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="55" column="15" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="106">
+          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="290" column="41" lean-forward="true" selection-start-line="290" selection-start-column="41" selection-end-line="290" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="21" column="32" lean-forward="true" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="550">
+          <caret line="38" column="89" selection-start-line="38" selection-start-column="89" selection-end-line="38" selection-end-column="89" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="11" column="28" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1166">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="818">
+          <caret line="285" column="13" lean-forward="true" selection-start-line="285" selection-start-column="13" selection-end-line="285" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="129" column="31" lean-forward="true" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="323" column="72" lean-forward="true" selection-start-line="323" selection-start-column="72" selection-end-line="323" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="44" column="13" lean-forward="true" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-638">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="244">
+          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="157">
+          <caret line="16" column="55" lean-forward="true" selection-start-line="16" selection-start-column="55" selection-end-line="16" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="270" column="33" lean-forward="true" selection-start-line="270" selection-start-column="33" selection-end-line="270" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="490">
+          <caret line="141" selection-start-line="141" selection-end-line="141" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="164" column="5" lean-forward="true" selection-start-line="164" selection-start-column="5" selection-end-line="164" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/apiTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-242">
+          <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="61" column="16" lean-forward="true" selection-start-line="61" selection-start-column="16" selection-end-line="61" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="700">
+          <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="12" column="34" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="39" column="9" lean-forward="true" selection-start-line="39" selection-start-column="9" selection-end-line="39" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="32" column="29" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="29" />
           <folding>
-            <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-            <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#1838#1839#0" expanded="true" />
+            <element signature="e#1863#1864#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1925#1926#0" expanded="true" />
+            <element signature="e#1822#1823#0" expanded="true" />
+            <element signature="e#1851#1852#0" expanded="true" />
+            <element signature="e#1895#1896#0" expanded="true" />
+            <element signature="e#1931#1932#0" expanded="true" />
+            <element signature="e#2132#2133#0" expanded="true" />
+            <element signature="e#2164#2165#0" expanded="true" />
+            <element signature="e#2214#2215#0" expanded="true" />
+            <element signature="e#2256#2257#0" expanded="true" />
+            <element signature="e#2330#2331#0" expanded="true" />
+            <element signature="e#2370#2371#0" expanded="true" />
+            <element signature="e#2436#2437#0" expanded="true" />
+            <element signature="e#2494#2495#0" expanded="true" />
+            <element signature="e#2569#2570#0" expanded="true" />
+            <element signature="e#2602#2603#0" expanded="true" />
+            <element signature="e#2654#2655#0" expanded="true" />
+            <element signature="e#2698#2699#0" expanded="true" />
+            <element signature="e#2764#2765#0" expanded="true" />
+            <element signature="e#2795#2796#0" expanded="true" />
+            <element signature="e#2843#2844#0" expanded="true" />
+            <element signature="e#2883#2884#0" expanded="true" />
+            <element signature="e#2948#2949#0" expanded="true" />
+            <element signature="e#2980#2981#0" expanded="true" />
+            <element signature="e#3030#3031#0" expanded="true" />
+            <element signature="e#3072#3073#0" expanded="true" />
+            <element signature="e#3134#3135#0" expanded="true" />
+            <element signature="e#3162#3163#0" expanded="true" />
+            <element signature="e#3204#3205#0" expanded="true" />
+            <element signature="e#3238#3239#0" expanded="true" />
+            <element signature="e#3307#3308#0" expanded="true" />
+            <element signature="e#3346#3347#0" expanded="true" />
+            <element signature="e#3410#3411#0" expanded="true" />
+            <element signature="e#3466#3467#0" expanded="true" />
+            <element signature="e#3537#3538#0" expanded="true" />
+            <element signature="e#3567#3568#0" expanded="true" />
+            <element signature="e#3613#3614#0" expanded="true" />
+            <element signature="e#3651#3652#0" expanded="true" />
+            <element signature="e#3721#3722#0" expanded="true" />
+            <element signature="e#3759#3760#0" expanded="true" />
+            <element signature="e#3821#3822#0" expanded="true" />
+            <element signature="e#3875#3876#0" expanded="true" />
+            <element signature="e#3953#3954#0" expanded="true" />
+            <element signature="e#3991#3992#0" expanded="true" />
+            <element signature="e#4053#4054#0" expanded="true" />
+            <element signature="e#4107#4108#0" expanded="true" />
+            <element signature="e#4186#4187#0" expanded="true" />
+            <element signature="e#4225#4226#0" expanded="true" />
+            <element signature="e#4289#4290#0" expanded="true" />
+            <element signature="e#4345#4346#0" expanded="true" />
+            <element signature="e#4430#4431#0" expanded="true" />
+            <element signature="e#4474#4475#0" expanded="true" />
+            <element signature="e#4698#4699#0" expanded="true" />
+            <element signature="e#4740#4741#0" expanded="true" />
+            <element signature="e#4810#4811#0" expanded="true" />
+            <element signature="e#4872#4873#0" expanded="true" />
+            <element signature="e#4955#4956#0" expanded="true" />
+            <element signature="e#4994#4995#0" expanded="true" />
+            <element signature="e#5058#5059#0" expanded="true" />
+            <element signature="e#5114#5115#0" expanded="true" />
+            <element signature="e#5194#5195#0" expanded="true" />
+            <element signature="e#5233#5234#0" expanded="true" />
+            <element signature="e#5297#5298#0" expanded="true" />
+            <element signature="e#5353#5354#0" expanded="true" />
+            <element signature="e#5428#5429#0" expanded="true" />
+            <element signature="e#5462#5463#0" expanded="true" />
+            <element signature="e#5516#5517#0" expanded="true" />
+            <element signature="e#5562#5563#0" expanded="true" />
+            <element signature="e#5634#5635#0" expanded="true" />
+            <element signature="e#5670#5671#0" expanded="true" />
+            <element signature="e#5728#5729#0" expanded="true" />
+            <element signature="e#5778#5779#0" expanded="true" />
+            <element signature="e#5852#5853#0" expanded="true" />
+            <element signature="e#5888#5889#0" expanded="true" />
+            <element signature="e#5946#5947#0" expanded="true" />
+            <element signature="e#5996#5997#0" expanded="true" />
+            <element signature="e#6067#6068#0" expanded="true" />
+            <element signature="e#6100#6101#0" expanded="true" />
+            <element signature="e#6152#6153#0" expanded="true" />
+            <element signature="e#6196#6197#0" expanded="true" />
+            <element signature="e#6261#6262#0" expanded="true" />
+            <element signature="e#6291#6292#0" expanded="true" />
+            <element signature="e#6337#6338#0" expanded="true" />
+            <element signature="e#6375#6376#0" expanded="true" />
+            <element signature="e#6437#6438#0" expanded="true" />
+            <element signature="e#6467#6468#0" expanded="true" />
+            <element signature="e#6513#6514#0" expanded="true" />
+            <element signature="e#6551#6552#0" expanded="true" />
+            <element signature="e#6613#6614#0" expanded="true" />
+            <element signature="e#6643#6644#0" expanded="true" />
+            <element signature="e#6689#6690#0" expanded="true" />
+            <element signature="e#6727#6728#0" expanded="true" />
+            <element signature="e#6796#6797#0" expanded="true" />
+            <element signature="e#6829#6830#0" expanded="true" />
+            <element signature="e#6881#6882#0" expanded="true" />
+            <element signature="e#6925#6926#0" expanded="true" />
+            <element signature="e#6995#6996#0" expanded="true" />
+            <element signature="e#7030#7031#0" expanded="true" />
+            <element signature="e#7086#7087#0" expanded="true" />
+            <element signature="e#7134#7135#0" expanded="true" />
+            <element signature="e#7202#7203#0" expanded="true" />
+            <element signature="e#7233#7234#0" expanded="true" />
+            <element signature="e#7281#7282#0" expanded="true" />
+            <element signature="e#7321#7322#0" expanded="true" />
+            <element signature="e#7390#7391#0" expanded="true" />
+            <element signature="e#7426#7427#0" expanded="true" />
+            <element signature="e#7484#7485#0" expanded="true" />
+            <element signature="e#7534#7535#0" expanded="true" />
+            <element signature="e#7602#7603#0" expanded="true" />
+            <element signature="e#7636#7637#0" expanded="true" />
+            <element signature="e#7690#7691#0" expanded="true" />
+            <element signature="e#7736#7737#0" expanded="true" />
+            <element signature="e#7806#7807#0" expanded="true" />
+            <element signature="e#7840#7841#0" expanded="true" />
+            <element signature="e#7894#7895#0" expanded="true" />
+            <element signature="e#7940#7941#0" expanded="true" />
+            <element signature="e#8006#8007#0" expanded="true" />
+            <element signature="e#8036#8037#0" expanded="true" />
+            <element signature="e#8082#8083#0" expanded="true" />
+            <element signature="e#8120#8121#0" expanded="true" />
+            <element signature="e#8189#8190#0" expanded="true" />
+            <element signature="e#8226#8227#0" expanded="true" />
+            <element signature="e#8286#8287#0" expanded="true" />
+            <element signature="e#8338#8339#0" expanded="true" />
+            <element signature="e#8417#8418#0" expanded="true" />
+            <element signature="e#8457#8458#0" expanded="true" />
+            <element signature="e#8523#8524#0" expanded="true" />
+            <element signature="e#8581#8582#0" expanded="true" />
+            <element signature="e#8655#8656#0" expanded="true" />
+            <element signature="e#8687#8688#0" expanded="true" />
+            <element signature="e#8737#8738#0" expanded="true" />
+            <element signature="e#8779#8780#0" expanded="true" />
+            <element signature="e#8846#8847#0" expanded="true" />
+            <element signature="e#8879#8880#0" expanded="true" />
+            <element signature="e#8931#8932#0" expanded="true" />
+            <element signature="e#8975#8976#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#787#788#0" expanded="true" />
+            <element signature="e#817#818#0" expanded="true" />
+            <element signature="e#2105#2106#0" expanded="true" />
+            <element signature="e#2135#2136#0" expanded="true" />
+            <element signature="e#2431#2432#0" expanded="true" />
+            <element signature="e#2461#2462#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index 854f1f1..0db633a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -165,12 +165,16 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String startDay,String endDay) {
+    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew) {
         try {
 
             Criteria criteria = createCriteria(PgAlarm.class);
             criteria.addOrder(Order.desc("id"));
 
+            if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) {
+                criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
+            }
+
             if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay))
             {
                 criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay)));
@@ -193,9 +197,11 @@
 
                 criteria.add(Restrictions.le("alarmDate",date));
             }
+            if(StringUtils.isNotBlank(isNew)&&isNew.equals("true"))
+                criteria.add(Restrictions.eq("active", 1));
 
             List<PgAlarm> pgAlarmList = criteria.list();
-            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
     }
 
     //根据设备位置(仓位)获取摄像机列表
-    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+    public List<PgDeviceDto> getPgCameraListByPosition(String partition,String position){
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.like("position",position+"%"));
-//        criteria.add(Restrictions.eq("devType","球机"));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(position))
+            criteria.add(Restrictions.like("position",position+"%"));
+
         criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
 
         List<PgDevice> pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
             dto.setDevCode(objects[5].toString());
             dto.setDevType(objects[6].toString());
             if(objects[7]!=null)
-            dto.setIp(objects[7].toString());
+                dto.setIp(objects[7].toString());
             dto.setIsOpen(objects[8].toString());
             dto.setPartition(objects[11].toString());
             dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index 8ebf74d..3c657a7 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgEquipment;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
 import com.casic.PgInterface.devTable.dto.PgEquipmentDto;
@@ -34,9 +35,12 @@
     public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
-        criteria.add(Restrictions.eq("eqName",eqName));
-        criteria.add(Restrictions.eq("eqCode",eqCode));
-        criteria.add(Restrictions.eq("eqType",eqType));
+        if(StringUtils.isNotBlank(eqName))
+            criteria.add(Restrictions.eq("eqName",eqName));
+        if(StringUtils.isNotBlank(eqCode))
+            criteria.add(Restrictions.eq("eqCode",eqCode));
+        if(StringUtils.isNotBlank(eqType))
+            criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
@@ -51,10 +55,9 @@
 
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
-        //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
         String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
-        +eqType+"' group by equipment.EQ_NAME";
+                +eqType+"' group by equipment.EQ_NAME";
 
         List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4ed68e4..e413a5c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
@@ -39,7 +40,8 @@
 
     public List<PgPipeLineDto> getPipeLineByLineType(String lineType) {
         Criteria criteria = createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineType", lineType));
+        if(StringUtils.isNotBlank(lineType))
+            criteria.add(Restrictions.eq("lineType", lineType));
 
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    private Long id;
-    private String keyId;//巡检记录单id
-    private String planId;//巡检计划ID
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    @Column(name="KEY_ID")
-    public String getKeyId() {
-        return keyId;
-    }
-
-    public void setKeyId(String keyId) {
-        this.keyId = keyId;
-    }
-
-    @Column(name="PLAN_ID")
-    public String getPlanId() {
-        return planId;
-    }
-
-    public void setPlanId(String planId) {
-        this.planId = planId;
-    }
-
-    @Column(name="CREATE_DATE")
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    @Column(name="STATE")
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    @Column(name="CREATOR")
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    @Column(name="PLAN_NAME")
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    @Column(name="RECORD_NO")
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    @Column(name="PLAN_NO")
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    @Column(name="RESPONSIBIE_DEPT")
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    @Column(name="INSPECTION_PERSON")
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    @Column(name="PATROL_MAN")
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    @Column(name="OPERATE_DATE")
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    @Column(name="REMARK")
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Column(name="BUILD_CABIN")
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    @Column(name="PROJECT")
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    @Column(name="START_PILE_NO")
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    @Column(name="END_PILE_NO")
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    @Column(name="INSPECTION_PRACE")
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    @Column(name="OTHER_PATROL_MAN")
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private Long id;
+    private String KEY_ID;//唯一键值
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_PERSON;//巡检人
+    private String START_DATE;//巡检开始时间
+    private String END_DATE;
+    private String FREQUENCY;//巡检频率
+    private String STATE;//状态
+    private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+    private String PLAN_NO;//巡检计划编号
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_MODE;//巡检方式
+    private String INSPECTION_ROUTE;//巡检路线
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String INSPECTION_GROUP;//巡检部门
+    private String INSERT_TIME;//插入时间
+    private String FREQUENCYDATE;//巡检具体日期
+    private String FREQUENCYTIME;//巡检具体时间
+    private String CREATEDATE;//创建时间
+    private String CREATOR;//创建人
+    private String PROJECT;//项目
+    private String COMLILE;//编制人
+    private String START_TIME;//编制时间
+    private String DEVELOP_DEPT;//制定部门
+    private String END_TIME;//结束时间
+    private String START_PILE_NO;//开始桩号
+    private String END_PILE_NO;//结束桩号
+    private String BUILD_CABIN;//巡检舱室
+    private String MILEAGE;
+    private String FREQUENCY_TIME;//巡检具体时间
+    private String FREQUENCYTIME_END;
+    private String KETTLE_TS;
+    private String UPDATEDATE;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="KEY_ID")
+    public String getKEY_ID() {
+        return KEY_ID;
+    }
+
+    public void setKEY_ID(String KEY_ID) {
+        this.KEY_ID = KEY_ID;
+    }
+
+    @Column(name="PLAN_NAME")
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    @Column(name="INSPECTION_PERSON")
+    public String getINSPECTION_PERSON() {
+        return INSPECTION_PERSON;
+    }
+
+    public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+        this.INSPECTION_PERSON = INSPECTION_PERSON;
+    }
+
+    @Column(name="START_DATE")
+    public String getSTART_DATE() {
+        return START_DATE;
+    }
+
+    public void setSTART_DATE(String START_DATE) {
+        this.START_DATE = START_DATE;
+    }
+
+    @Column(name="END_DATE")
+    public String getEND_DATE() {
+        return END_DATE;
+    }
+
+    public void setEND_DATE(String END_DATE) {
+        this.END_DATE = END_DATE;
+    }
+
+    @Column(name="FREQUENCY")
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    @Column(name="STATE")
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    @Column(name="RESPONSIBLE_DEPT")
+    public String getRESPONSIBLE_DEPT() {
+        return RESPONSIBLE_DEPT;
+    }
+
+    public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+        this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+    }
+
+    @Column(name="PLAN_NO")
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    @Column(name="INSPECTION_TYPE")
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    @Column(name="INSPECTION_MODE")
+    public String getINSPECTION_MODE() {
+        return INSPECTION_MODE;
+    }
+
+    public void setINSPECTION_MODE(String INSPECTION_MODE) {
+        this.INSPECTION_MODE = INSPECTION_MODE;
+    }
+
+    @Column(name="INSPECTION_ROUTE")
+    public String getINSPECTION_ROUTE() {
+        return INSPECTION_ROUTE;
+    }
+
+    public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+        this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+    }
+
+    @Column(name="INSPECTION_START_TIME")
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    @Column(name="INSPECTION_END_TIME")
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    @Column(name="INSPECTION_PRACE")
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    @Column(name="INSPECTION_GROUP")
+    public String getINSPECTION_GROUP() {
+        return INSPECTION_GROUP;
+    }
+
+    public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+        this.INSPECTION_GROUP = INSPECTION_GROUP;
+    }
+
+    @Column(name="INSERT_TIME")
+    public String getINSERT_TIME() {
+        return INSERT_TIME;
+    }
+
+    public void setINSERT_TIME(String INSERT_TIME) {
+        this.INSERT_TIME = INSERT_TIME;
+    }
+
+    @Column(name="FREQUENCYDATE")
+    public String getFREQUENCYDATE() {
+        return FREQUENCYDATE;
+    }
+
+    public void setFREQUENCYDATE(String FREQUENCYDATE) {
+        this.FREQUENCYDATE = FREQUENCYDATE;
+    }
+
+    @Column(name="FREQUENCYTIME")
+    public String getFREQUENCYTIME() {
+        return FREQUENCYTIME;
+    }
+
+    public void setFREQUENCYTIME(String FREQUENCYTIME) {
+        this.FREQUENCYTIME = FREQUENCYTIME;
+    }
+
+    @Column(name="CREATEDATE")
+    public String getCREATEDATE() {
+        return CREATEDATE;
+    }
+
+    public void setCREATEDATE(String CREATEDATE) {
+        this.CREATEDATE = CREATEDATE;
+    }
+
+    @Column(name="CREATOR")
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    @Column(name="PROJECT")
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    @Column(name="COMLILE")
+    public String getCOMLILE() {
+        return COMLILE;
+    }
+
+    public void setCOMLILE(String COMLILE) {
+        this.COMLILE = COMLILE;
+    }
+
+    @Column(name="START_TIME")
+    public String getSTART_TIME() {
+        return START_TIME;
+    }
+
+    public void setSTART_TIME(String START_TIME) {
+        this.START_TIME = START_TIME;
+    }
+
+    @Column(name="DEVELOP_DEPT")
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    @Column(name="END_TIME")
+    public String getEND_TIME() {
+        return END_TIME;
+    }
+
+    public void setEND_TIME(String END_TIME) {
+        this.END_TIME = END_TIME;
+    }
+
+    @Column(name="START_PILE_NO")
+    public String getSTART_PILE_NO() {
+        return START_PILE_NO;
+    }
+
+    public void setSTART_PILE_NO(String START_PILE_NO) {
+        this.START_PILE_NO = START_PILE_NO;
+    }
+
+    @Column(name="END_PILE_NO")
+    public String getEND_PILE_NO() {
+        return END_PILE_NO;
+    }
+
+    public void setEND_PILE_NO(String END_PILE_NO) {
+        this.END_PILE_NO = END_PILE_NO;
+    }
+
+    @Column(name="BUILD_CABIN")
+    public String getBUILD_CABIN() {
+        return BUILD_CABIN;
+    }
+
+    public void setBUILD_CABIN(String BUILD_CABIN) {
+        this.BUILD_CABIN = BUILD_CABIN;
+    }
+
+    @Column(name="MILEAGE")
+    public String getMILEAGE() {
+        return MILEAGE;
+    }
+
+    public void setMILEAGE(String MILEAGE) {
+        this.MILEAGE = MILEAGE;
+    }
+
+    @Column(name="FREQUENCY_TIME")
+    public String getFREQUENCY_TIME() {
+        return FREQUENCY_TIME;
+    }
+
+    public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+        this.FREQUENCY_TIME = FREQUENCY_TIME;
+    }
+
+    @Column(name="FREQUENCYTIME_END")
+    public String getFREQUENCYTIME_END() {
+        return FREQUENCYTIME_END;
+    }
+
+    public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+        this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+    }
+
+    @Column(name="KETTLE_TS")
+    public String getKETTLE_TS() {
+        return KETTLE_TS;
+    }
+
+    public void setKETTLE_TS(String KETTLE_TS) {
+        this.KETTLE_TS = KETTLE_TS;
+    }
+
+    @Column(name="UPDATEDATE")
+    public String getUPDATEDATE() {
+        return UPDATEDATE;
+    }
+
+    public void setUPDATEDATE(String UPDATEDATE) {
+        this.UPDATEDATE = UPDATEDATE;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 5346b57..2f8d359 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -66,7 +66,7 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REPAIRMAN")
+    @Column(name="REOAIRMAN")
     public String getRepairMan() {
         return repairMan;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
-    private Long id;
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-
-
-    public static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
-        PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
-        pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
-        pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
-        pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
-        pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
-        pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
-        pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
-        pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
-        pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
-        pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
-        pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
-        pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
-        pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
-        pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
-        pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
-        return pgAssetInSpectionRecordDto;
-    }
-
-
-    public static List<PgAssetInSpectionRecordDto> ConvertToDtoList(List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList){
-        List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-        for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
-            pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
-        }
-
-        return pgAssetInSpectionRecordDtoList;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
-    private String num;
-    private String createDate;
-
-    public String getNum() {
-        return num;
-    }
-
-    public void setNum(String num) {
-        this.num = num;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+    private Long id;
+    private String PLAN_NO;//巡检计划编号
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String FREQUENCY;//巡检频率
+    private String CREATOR;//创建人
+    private String DEVELOP_DEPT;//制定部门
+    private String PROJECT;//项目
+    private String STATE;//状态
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+        PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+        pgAssetPlanDto.setId(pgAssetPlan.getId());
+        pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+        pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+        pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+        pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+        pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+        pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+        pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+        pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+        pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+        pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+        pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+        return pgAssetPlanDto;
+    }
+
+    public static List<PgAssetPlanDto> ConvertToPgAssetDtoList(List<PgAssetPlan> pgAssetPlanList){
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
+
+        for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+            pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+        }
+
+        return pgAssetPlanDtoList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
new file mode 100644
index 0000000..bc12db1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
@@ -0,0 +1,24 @@
+package com.casic.PgInterface.maintenance.dto;
+
+public class PgAssetPlanStatic {
+
+    private String num;
+    private String createDate;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
deleted file mode 100644
index c41ca7d..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.casic.PgInterface.maintenance.manager;
-
-import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
-
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
-        try {
-            String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
-                    "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
-                    "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-
-            if(patrolMan!=null)
-                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
-            if(startTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
-            if(endTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')<to_date('"+endTime+"','yyyy-MM-dd')";
-
-            sql+=" order by id";
-
-            List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
-
-            List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList=new ArrayList<>();
-            for(Object[] objects1:objects){
-                PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord();
-
-                pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString()));
-                pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1]));
-                pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2]));
-                pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3]));
-                pgAssetInSpectionRecord.setState(String.valueOf(objects1[4]));
-                pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5]));
-                pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6]));
-                pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7]));
-                pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8]));
-                pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9]));
-                pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10]));
-                pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11]));
-                pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12]));
-                pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13]));
-                pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14]));
-                pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15]));
-                pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16]));
-                pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17]));
-                pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18]));
-                pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19]));
-
-                pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord);
-            }
-
-            List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-            for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList)
-            {
-                pgAssetInSpectionRecordDtoList.add(PgAssetInSpectionRecordDto.ConvertToDto(pgAssetInSpectionRecord));
-            }
-
-            return pgAssetInSpectionRecordDtoList;
-        }
-        catch(Exception e)
-        {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public List<PgAssetInSpectionRecordStatic> getPgAssetInSpectionRecordStaticLisByTime(
-            String startTime, String endTime, String staticType) {
-
-        String sql="";
-        String dateType="";
-        List<PgAssetInSpectionRecordStatic> pgAssetInSpectionRecordStaticList=new ArrayList<>();
-        int type=Integer.valueOf(staticType);
-
-        switch(type) {
-            case 0://年
-                dateType = "yyyy";
-                break;
-            case 1://月
-                dateType = "yyyy-mm";
-                break;
-            case 2://周
-                dateType = "iw";
-                break;
-            case 3://日
-                dateType="yyyy-mm-dd";
-                break;
-            default:
-                break;
-        }
-
-        sql="select count(*), to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_RECORD t where 1=1";
-
-        if(startTime!=null)
-            sql+=" and t.CREATE_DATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
-        if(endTime!=null)
-            sql+=" and t.CREATE_DATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
-
-        sql+=" group by to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"')";
-
-        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
-        for(int i=0;i<objects.size();i++)
-        {
-            PgAssetInSpectionRecordStatic pgAssetInSpectionRecordStatic=new PgAssetInSpectionRecordStatic();
-            pgAssetInSpectionRecordStatic.setNum(objects.get(i)[0].toString());
-            pgAssetInSpectionRecordStatic.setCreateDate(objects.get(i)[1].toString());
-            pgAssetInSpectionRecordStaticList.add(pgAssetInSpectionRecordStatic);
-        }
-        return pgAssetInSpectionRecordStaticList;
-    }
-
-}
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ff69e2a..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,27 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190828.docx" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -32,72 +42,119 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="2" />
-          <entry key="java" value="243" />
-          <entry key="properties" value="6" />
+          <entry key="java" value="321" />
+          <entry key="properties" value="8" />
           <entry key="xml" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
-          <entry key="JAVA" value="243" />
-          <entry key="Properties" value="6" />
+          <entry key="JAVA" value="321" />
+          <entry key="Properties" value="8" />
           <entry key="XML" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="8082" />
-          <entry key="properties" value="49" />
-          <entry key="txt" value="64" />
+          <entry key="dummy" value="16" />
+          <entry key="java" value="10723" />
+          <entry key="properties" value="59" />
+          <entry key="txt" value="118" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="8082" />
-          <entry key="PLAIN_TEXT" value="64" />
-          <entry key="Properties" value="49" />
+          <entry key="JAVA" value="10723" />
+          <entry key="PLAIN_TEXT" value="134" />
+          <entry key="Properties" value="59" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="4" />
+          <entry key="project.closed" value="28" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
           <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.24" value="1" />
+          <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="1" />
-          <entry key="project.open.time.3" value="3" />
-          <entry key="project.open.time.31" value="1" />
+          <entry key="project.open.time.28" value="1" />
+          <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.31" value="2" />
           <entry key="project.open.time.37" value="1" />
+          <entry key="project.open.time.39" value="2" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.40" value="1" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="1" />
+          <entry key="project.open.time.44" value="2" />
           <entry key="project.open.time.45" value="2" />
           <entry key="project.open.time.48" value="1" />
           <entry key="project.open.time.49" value="1" />
+          <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.58" value="1" />
           <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.71" value="1" />
+          <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.71" value="2" />
           <entry key="project.open.time.76" value="1" />
-          <entry key="project.opened" value="25" />
+          <entry key="project.opened" value="41" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+            <state relative-caret-position="174">
+              <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
               <folding>
-                <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-                <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="352">
+              <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#787#788#0" expanded="true" />
+                <element signature="e#817#818#0" expanded="true" />
+                <element signature="e#2105#2106#0" expanded="true" />
+                <element signature="e#2135#2136#0" expanded="true" />
+                <element signature="e#2431#2432#0" expanded="true" />
+                <element signature="e#2461#2462#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="638">
+              <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+              <folding>
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -122,6 +179,7 @@
       <find>getPgDeviceByDevType</find>
       <find>message</find>
       <find>getConstructionByType</find>
+      <find>getPgCameraListByPosition</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -130,24 +188,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanTypeDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
@@ -162,17 +207,38 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
       </list>
     </option>
   </component>
@@ -208,16 +274,18 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="3" />
-    <option name="y" value="10" />
-    <option name="width" value="1386" />
-    <option name="height" value="788" />
+    <option name="x" value="1410" />
+    <option name="y" value="117" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -258,7 +326,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -267,16 +335,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -286,7 +345,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="dto" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -296,7 +355,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="manager" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -308,19 +367,10 @@
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="webapp" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -359,6 +409,7 @@
       </deployment>
       <server-settings>
         <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_7" />
+        <option name="JNDI_PORT" value="10991" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -456,7 +507,23 @@
       <workItem from="1566350810712" duration="6803000" />
       <workItem from="1566435787074" duration="10717000" />
       <workItem from="1566521753529" duration="14265000" />
-      <workItem from="1566614176989" duration="5693000" />
+      <workItem from="1566614176989" duration="14059000" />
+      <workItem from="1566780822009" duration="1026000" />
+      <workItem from="1566891563975" duration="284000" />
+      <workItem from="1566893107340" duration="3382000" />
+      <workItem from="1566953794976" duration="11039000" />
+      <workItem from="1567059357700" duration="484000" />
+      <workItem from="1567082835097" duration="1086000" />
+      <workItem from="1567126428020" duration="1539000" />
+      <workItem from="1567129277820" duration="5788000" />
+      <workItem from="1567136008996" duration="2568000" />
+      <workItem from="1567237040302" duration="111000" />
+      <workItem from="1567495626345" duration="2797000" />
+      <workItem from="1567558770152" duration="2352000" />
+      <workItem from="1567577368149" duration="640000" />
+      <workItem from="1567751224608" duration="780000" />
+      <workItem from="1568019299799" duration="695000" />
+      <workItem from="1568082566133" duration="4016000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -493,17 +560,60 @@
       <option name="project" value="LOCAL" />
       <updated>1566553388171</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="整理管线部分">
+      <created>1566620046627</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1566620046627</updated>
+    </task>
+    <task id="LOCAL-00007" summary="合并代码提交">
+      <created>1566781001910</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1566781001910</updated>
+    </task>
+    <task id="LOCAL-00008" summary="合并代码提交">
+      <created>1566963831930</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1566963831930</updated>
+    </task>
+    <task id="LOCAL-00009" summary="修改报警阈值">
+      <created>1566972146710</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1566972146710</updated>
+    </task>
+    <task id="LOCAL-00010" summary="修改巡检维护表字段">
+      <created>1567126525554</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1567126525554</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="142930000" />
+    <option name="totallyTimeSpent" value="189883000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
+    <frame x="1358" y="-8" width="1456" height="916" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29297996" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -511,13 +621,14 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Thumbnails" weight="0.3295082" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.5081967" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.3849105" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
       <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
       <window_info anchor="bottom" id="Spring" order="8" />
       <window_info anchor="bottom" id="Terminal" order="9" />
@@ -539,7 +650,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2193646" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -547,22 +658,23 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.47540984" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
-      <window_info anchor="bottom" id="Spring" order="8" />
-      <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
-      <window_info anchor="bottom" id="Statistic" order="11" />
-      <window_info anchor="bottom" id="Java Enterprise" order="12" />
-      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="14" weight="0.32786885" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.52307695" />
+      <window_info anchor="bottom" id="Thumbnails" order="0" weight="0.3295082" />
+      <window_info anchor="bottom" id="Message" order="1" />
+      <window_info anchor="bottom" id="Find" order="2" />
+      <window_info anchor="bottom" id="Run" order="3" />
+      <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.49924356" weight="0.49344262" />
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Application Servers" order="8" weight="0.3276923" />
+      <window_info anchor="bottom" id="Spring" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
+      <window_info anchor="bottom" id="Statistic" order="12" />
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <window_info anchor="bottom" id="Database Changes" order="14" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="15" weight="0.32786885" />
+      <window_info anchor="bottom" id="Messages" order="16" weight="0.5229508" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -578,6 +690,16 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -587,7 +709,11 @@
     <MESSAGE value="修改权限问题" />
     <MESSAGE value="修改人员登录返回接口" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整理管线部分" />
+    <MESSAGE value="合并代码提交" />
+    <MESSAGE value="修改报警阈值" />
+    <MESSAGE value="修改巡检维护表字段" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护表字段" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -602,322 +728,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-532">
-          <caret line="50" column="28" lean-forward="true" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="19" column="60" selection-start-line="19" selection-start-column="60" selection-end-line="19" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="100" column="34" lean-forward="true" selection-start-line="100" selection-start-column="34" selection-end-line="100" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1474">
-          <caret line="84" column="58" selection-start-line="84" selection-start-column="58" selection-end-line="84" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1100">
-          <caret line="58" column="18" selection-start-line="58" selection-start-column="18" selection-end-line="58" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6842">
-          <caret line="329" selection-start-line="329" selection-end-line="329" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="102" column="24" lean-forward="true" selection-start-line="102" selection-start-column="24" selection-end-line="102" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="72" column="56" lean-forward="true" selection-start-line="72" selection-start-column="56" selection-end-line="72" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="90" column="39" lean-forward="true" selection-start-line="90" selection-start-column="39" selection-end-line="90" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="97" column="16" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
-          <caret line="14" column="52" lean-forward="true" selection-start-line="14" selection-start-column="52" selection-end-line="14" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="26" column="34" lean-forward="true" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="61" column="1" lean-forward="true" selection-start-line="61" selection-start-column="1" selection-end-line="61" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="208" column="49" lean-forward="true" selection-start-line="208" selection-start-column="49" selection-end-line="208" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="140" column="57" selection-start-line="140" selection-start-column="57" selection-end-line="140" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="111" column="36" selection-start-line="111" selection-start-column="36" selection-end-line="111" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="3" lean-forward="true" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="81" column="58" lean-forward="true" selection-start-line="81" selection-start-column="58" selection-end-line="81" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="472">
-          <caret line="118" column="59" selection-start-line="118" selection-start-column="59" selection-end-line="118" selection-end-column="59" />
-          <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-198">
-          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="69" column="32" lean-forward="true" selection-start-line="69" selection-start-column="32" selection-end-line="70" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="142" column="59" lean-forward="true" selection-start-line="142" selection-start-column="59" selection-end-line="142" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="349" column="9" lean-forward="true" selection-start-line="349" selection-start-column="9" selection-end-line="349" selection-end-column="9" />
-          <folding>
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="e#12105#12121#0" expanded="true" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-686">
-          <caret line="67" column="31" lean-forward="true" selection-start-line="67" selection-start-column="31" selection-end-line="67" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="93" column="24" lean-forward="true" selection-start-line="93" selection-start-column="24" selection-end-line="93" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="57" column="23" lean-forward="true" selection-start-line="57" selection-start-column="23" selection-end-line="57" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-408">
-          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="98" column="40" lean-forward="true" selection-start-line="98" selection-start-column="40" selection-end-line="98" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="572">
@@ -925,13 +735,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="328" column="32" lean-forward="true" selection-start-line="328" selection-start-column="32" selection-end-line="328" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
@@ -950,16 +753,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="396">
           <caret line="23" column="32" lean-forward="true" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
-          <folding>
-            <element signature="e#2635#2636#0" expanded="true" />
-            <element signature="e#2671#2672#0" expanded="true" />
-            <element signature="e#2727#2728#0" expanded="true" />
-            <element signature="e#2777#2778#0" expanded="true" />
-            <element signature="e#2877#2878#0" expanded="true" />
-            <element signature="e#2911#2912#0" expanded="true" />
-            <element signature="e#2963#2964#0" expanded="true" />
-            <element signature="e#3009#3010#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -972,14 +765,481 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+        <state relative-caret-position="66">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="59" column="46" lean-forward="true" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3586">
+          <caret line="179" column="16" selection-start-line="179" selection-start-column="16" selection-end-line="179" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5478">
+          <caret line="273" column="3" selection-start-line="273" selection-start-column="3" selection-end-line="273" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1870">
+          <caret line="147" column="11" selection-start-line="147" selection-start-column="11" selection-end-line="147" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="55" column="15" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="106">
+          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="290" column="41" lean-forward="true" selection-start-line="290" selection-start-column="41" selection-end-line="290" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="21" column="32" lean-forward="true" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="550">
+          <caret line="38" column="89" selection-start-line="38" selection-start-column="89" selection-end-line="38" selection-end-column="89" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="11" column="28" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1166">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="818">
+          <caret line="285" column="13" lean-forward="true" selection-start-line="285" selection-start-column="13" selection-end-line="285" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="129" column="31" lean-forward="true" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="323" column="72" lean-forward="true" selection-start-line="323" selection-start-column="72" selection-end-line="323" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="44" column="13" lean-forward="true" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-638">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="244">
+          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="157">
+          <caret line="16" column="55" lean-forward="true" selection-start-line="16" selection-start-column="55" selection-end-line="16" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="270" column="33" lean-forward="true" selection-start-line="270" selection-start-column="33" selection-end-line="270" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="490">
+          <caret line="141" selection-start-line="141" selection-end-line="141" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="164" column="5" lean-forward="true" selection-start-line="164" selection-start-column="5" selection-end-line="164" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/apiTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-242">
+          <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="61" column="16" lean-forward="true" selection-start-line="61" selection-start-column="16" selection-end-line="61" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="700">
+          <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="12" column="34" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="39" column="9" lean-forward="true" selection-start-line="39" selection-start-column="9" selection-end-line="39" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="32" column="29" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="29" />
           <folding>
-            <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-            <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#1838#1839#0" expanded="true" />
+            <element signature="e#1863#1864#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1925#1926#0" expanded="true" />
+            <element signature="e#1822#1823#0" expanded="true" />
+            <element signature="e#1851#1852#0" expanded="true" />
+            <element signature="e#1895#1896#0" expanded="true" />
+            <element signature="e#1931#1932#0" expanded="true" />
+            <element signature="e#2132#2133#0" expanded="true" />
+            <element signature="e#2164#2165#0" expanded="true" />
+            <element signature="e#2214#2215#0" expanded="true" />
+            <element signature="e#2256#2257#0" expanded="true" />
+            <element signature="e#2330#2331#0" expanded="true" />
+            <element signature="e#2370#2371#0" expanded="true" />
+            <element signature="e#2436#2437#0" expanded="true" />
+            <element signature="e#2494#2495#0" expanded="true" />
+            <element signature="e#2569#2570#0" expanded="true" />
+            <element signature="e#2602#2603#0" expanded="true" />
+            <element signature="e#2654#2655#0" expanded="true" />
+            <element signature="e#2698#2699#0" expanded="true" />
+            <element signature="e#2764#2765#0" expanded="true" />
+            <element signature="e#2795#2796#0" expanded="true" />
+            <element signature="e#2843#2844#0" expanded="true" />
+            <element signature="e#2883#2884#0" expanded="true" />
+            <element signature="e#2948#2949#0" expanded="true" />
+            <element signature="e#2980#2981#0" expanded="true" />
+            <element signature="e#3030#3031#0" expanded="true" />
+            <element signature="e#3072#3073#0" expanded="true" />
+            <element signature="e#3134#3135#0" expanded="true" />
+            <element signature="e#3162#3163#0" expanded="true" />
+            <element signature="e#3204#3205#0" expanded="true" />
+            <element signature="e#3238#3239#0" expanded="true" />
+            <element signature="e#3307#3308#0" expanded="true" />
+            <element signature="e#3346#3347#0" expanded="true" />
+            <element signature="e#3410#3411#0" expanded="true" />
+            <element signature="e#3466#3467#0" expanded="true" />
+            <element signature="e#3537#3538#0" expanded="true" />
+            <element signature="e#3567#3568#0" expanded="true" />
+            <element signature="e#3613#3614#0" expanded="true" />
+            <element signature="e#3651#3652#0" expanded="true" />
+            <element signature="e#3721#3722#0" expanded="true" />
+            <element signature="e#3759#3760#0" expanded="true" />
+            <element signature="e#3821#3822#0" expanded="true" />
+            <element signature="e#3875#3876#0" expanded="true" />
+            <element signature="e#3953#3954#0" expanded="true" />
+            <element signature="e#3991#3992#0" expanded="true" />
+            <element signature="e#4053#4054#0" expanded="true" />
+            <element signature="e#4107#4108#0" expanded="true" />
+            <element signature="e#4186#4187#0" expanded="true" />
+            <element signature="e#4225#4226#0" expanded="true" />
+            <element signature="e#4289#4290#0" expanded="true" />
+            <element signature="e#4345#4346#0" expanded="true" />
+            <element signature="e#4430#4431#0" expanded="true" />
+            <element signature="e#4474#4475#0" expanded="true" />
+            <element signature="e#4698#4699#0" expanded="true" />
+            <element signature="e#4740#4741#0" expanded="true" />
+            <element signature="e#4810#4811#0" expanded="true" />
+            <element signature="e#4872#4873#0" expanded="true" />
+            <element signature="e#4955#4956#0" expanded="true" />
+            <element signature="e#4994#4995#0" expanded="true" />
+            <element signature="e#5058#5059#0" expanded="true" />
+            <element signature="e#5114#5115#0" expanded="true" />
+            <element signature="e#5194#5195#0" expanded="true" />
+            <element signature="e#5233#5234#0" expanded="true" />
+            <element signature="e#5297#5298#0" expanded="true" />
+            <element signature="e#5353#5354#0" expanded="true" />
+            <element signature="e#5428#5429#0" expanded="true" />
+            <element signature="e#5462#5463#0" expanded="true" />
+            <element signature="e#5516#5517#0" expanded="true" />
+            <element signature="e#5562#5563#0" expanded="true" />
+            <element signature="e#5634#5635#0" expanded="true" />
+            <element signature="e#5670#5671#0" expanded="true" />
+            <element signature="e#5728#5729#0" expanded="true" />
+            <element signature="e#5778#5779#0" expanded="true" />
+            <element signature="e#5852#5853#0" expanded="true" />
+            <element signature="e#5888#5889#0" expanded="true" />
+            <element signature="e#5946#5947#0" expanded="true" />
+            <element signature="e#5996#5997#0" expanded="true" />
+            <element signature="e#6067#6068#0" expanded="true" />
+            <element signature="e#6100#6101#0" expanded="true" />
+            <element signature="e#6152#6153#0" expanded="true" />
+            <element signature="e#6196#6197#0" expanded="true" />
+            <element signature="e#6261#6262#0" expanded="true" />
+            <element signature="e#6291#6292#0" expanded="true" />
+            <element signature="e#6337#6338#0" expanded="true" />
+            <element signature="e#6375#6376#0" expanded="true" />
+            <element signature="e#6437#6438#0" expanded="true" />
+            <element signature="e#6467#6468#0" expanded="true" />
+            <element signature="e#6513#6514#0" expanded="true" />
+            <element signature="e#6551#6552#0" expanded="true" />
+            <element signature="e#6613#6614#0" expanded="true" />
+            <element signature="e#6643#6644#0" expanded="true" />
+            <element signature="e#6689#6690#0" expanded="true" />
+            <element signature="e#6727#6728#0" expanded="true" />
+            <element signature="e#6796#6797#0" expanded="true" />
+            <element signature="e#6829#6830#0" expanded="true" />
+            <element signature="e#6881#6882#0" expanded="true" />
+            <element signature="e#6925#6926#0" expanded="true" />
+            <element signature="e#6995#6996#0" expanded="true" />
+            <element signature="e#7030#7031#0" expanded="true" />
+            <element signature="e#7086#7087#0" expanded="true" />
+            <element signature="e#7134#7135#0" expanded="true" />
+            <element signature="e#7202#7203#0" expanded="true" />
+            <element signature="e#7233#7234#0" expanded="true" />
+            <element signature="e#7281#7282#0" expanded="true" />
+            <element signature="e#7321#7322#0" expanded="true" />
+            <element signature="e#7390#7391#0" expanded="true" />
+            <element signature="e#7426#7427#0" expanded="true" />
+            <element signature="e#7484#7485#0" expanded="true" />
+            <element signature="e#7534#7535#0" expanded="true" />
+            <element signature="e#7602#7603#0" expanded="true" />
+            <element signature="e#7636#7637#0" expanded="true" />
+            <element signature="e#7690#7691#0" expanded="true" />
+            <element signature="e#7736#7737#0" expanded="true" />
+            <element signature="e#7806#7807#0" expanded="true" />
+            <element signature="e#7840#7841#0" expanded="true" />
+            <element signature="e#7894#7895#0" expanded="true" />
+            <element signature="e#7940#7941#0" expanded="true" />
+            <element signature="e#8006#8007#0" expanded="true" />
+            <element signature="e#8036#8037#0" expanded="true" />
+            <element signature="e#8082#8083#0" expanded="true" />
+            <element signature="e#8120#8121#0" expanded="true" />
+            <element signature="e#8189#8190#0" expanded="true" />
+            <element signature="e#8226#8227#0" expanded="true" />
+            <element signature="e#8286#8287#0" expanded="true" />
+            <element signature="e#8338#8339#0" expanded="true" />
+            <element signature="e#8417#8418#0" expanded="true" />
+            <element signature="e#8457#8458#0" expanded="true" />
+            <element signature="e#8523#8524#0" expanded="true" />
+            <element signature="e#8581#8582#0" expanded="true" />
+            <element signature="e#8655#8656#0" expanded="true" />
+            <element signature="e#8687#8688#0" expanded="true" />
+            <element signature="e#8737#8738#0" expanded="true" />
+            <element signature="e#8779#8780#0" expanded="true" />
+            <element signature="e#8846#8847#0" expanded="true" />
+            <element signature="e#8879#8880#0" expanded="true" />
+            <element signature="e#8931#8932#0" expanded="true" />
+            <element signature="e#8975#8976#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#787#788#0" expanded="true" />
+            <element signature="e#817#818#0" expanded="true" />
+            <element signature="e#2105#2106#0" expanded="true" />
+            <element signature="e#2135#2136#0" expanded="true" />
+            <element signature="e#2431#2432#0" expanded="true" />
+            <element signature="e#2461#2462#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index 854f1f1..0db633a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -165,12 +165,16 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String startDay,String endDay) {
+    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew) {
         try {
 
             Criteria criteria = createCriteria(PgAlarm.class);
             criteria.addOrder(Order.desc("id"));
 
+            if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) {
+                criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
+            }
+
             if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay))
             {
                 criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay)));
@@ -193,9 +197,11 @@
 
                 criteria.add(Restrictions.le("alarmDate",date));
             }
+            if(StringUtils.isNotBlank(isNew)&&isNew.equals("true"))
+                criteria.add(Restrictions.eq("active", 1));
 
             List<PgAlarm> pgAlarmList = criteria.list();
-            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
     }
 
     //根据设备位置(仓位)获取摄像机列表
-    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+    public List<PgDeviceDto> getPgCameraListByPosition(String partition,String position){
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.like("position",position+"%"));
-//        criteria.add(Restrictions.eq("devType","球机"));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(position))
+            criteria.add(Restrictions.like("position",position+"%"));
+
         criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
 
         List<PgDevice> pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
             dto.setDevCode(objects[5].toString());
             dto.setDevType(objects[6].toString());
             if(objects[7]!=null)
-            dto.setIp(objects[7].toString());
+                dto.setIp(objects[7].toString());
             dto.setIsOpen(objects[8].toString());
             dto.setPartition(objects[11].toString());
             dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index 8ebf74d..3c657a7 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgEquipment;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
 import com.casic.PgInterface.devTable.dto.PgEquipmentDto;
@@ -34,9 +35,12 @@
     public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
-        criteria.add(Restrictions.eq("eqName",eqName));
-        criteria.add(Restrictions.eq("eqCode",eqCode));
-        criteria.add(Restrictions.eq("eqType",eqType));
+        if(StringUtils.isNotBlank(eqName))
+            criteria.add(Restrictions.eq("eqName",eqName));
+        if(StringUtils.isNotBlank(eqCode))
+            criteria.add(Restrictions.eq("eqCode",eqCode));
+        if(StringUtils.isNotBlank(eqType))
+            criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
@@ -51,10 +55,9 @@
 
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
-        //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
         String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
-        +eqType+"' group by equipment.EQ_NAME";
+                +eqType+"' group by equipment.EQ_NAME";
 
         List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4ed68e4..e413a5c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
@@ -39,7 +40,8 @@
 
     public List<PgPipeLineDto> getPipeLineByLineType(String lineType) {
         Criteria criteria = createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineType", lineType));
+        if(StringUtils.isNotBlank(lineType))
+            criteria.add(Restrictions.eq("lineType", lineType));
 
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    private Long id;
-    private String keyId;//巡检记录单id
-    private String planId;//巡检计划ID
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    @Column(name="KEY_ID")
-    public String getKeyId() {
-        return keyId;
-    }
-
-    public void setKeyId(String keyId) {
-        this.keyId = keyId;
-    }
-
-    @Column(name="PLAN_ID")
-    public String getPlanId() {
-        return planId;
-    }
-
-    public void setPlanId(String planId) {
-        this.planId = planId;
-    }
-
-    @Column(name="CREATE_DATE")
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    @Column(name="STATE")
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    @Column(name="CREATOR")
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    @Column(name="PLAN_NAME")
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    @Column(name="RECORD_NO")
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    @Column(name="PLAN_NO")
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    @Column(name="RESPONSIBIE_DEPT")
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    @Column(name="INSPECTION_PERSON")
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    @Column(name="PATROL_MAN")
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    @Column(name="OPERATE_DATE")
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    @Column(name="REMARK")
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Column(name="BUILD_CABIN")
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    @Column(name="PROJECT")
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    @Column(name="START_PILE_NO")
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    @Column(name="END_PILE_NO")
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    @Column(name="INSPECTION_PRACE")
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    @Column(name="OTHER_PATROL_MAN")
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private Long id;
+    private String KEY_ID;//唯一键值
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_PERSON;//巡检人
+    private String START_DATE;//巡检开始时间
+    private String END_DATE;
+    private String FREQUENCY;//巡检频率
+    private String STATE;//状态
+    private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+    private String PLAN_NO;//巡检计划编号
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_MODE;//巡检方式
+    private String INSPECTION_ROUTE;//巡检路线
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String INSPECTION_GROUP;//巡检部门
+    private String INSERT_TIME;//插入时间
+    private String FREQUENCYDATE;//巡检具体日期
+    private String FREQUENCYTIME;//巡检具体时间
+    private String CREATEDATE;//创建时间
+    private String CREATOR;//创建人
+    private String PROJECT;//项目
+    private String COMLILE;//编制人
+    private String START_TIME;//编制时间
+    private String DEVELOP_DEPT;//制定部门
+    private String END_TIME;//结束时间
+    private String START_PILE_NO;//开始桩号
+    private String END_PILE_NO;//结束桩号
+    private String BUILD_CABIN;//巡检舱室
+    private String MILEAGE;
+    private String FREQUENCY_TIME;//巡检具体时间
+    private String FREQUENCYTIME_END;
+    private String KETTLE_TS;
+    private String UPDATEDATE;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="KEY_ID")
+    public String getKEY_ID() {
+        return KEY_ID;
+    }
+
+    public void setKEY_ID(String KEY_ID) {
+        this.KEY_ID = KEY_ID;
+    }
+
+    @Column(name="PLAN_NAME")
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    @Column(name="INSPECTION_PERSON")
+    public String getINSPECTION_PERSON() {
+        return INSPECTION_PERSON;
+    }
+
+    public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+        this.INSPECTION_PERSON = INSPECTION_PERSON;
+    }
+
+    @Column(name="START_DATE")
+    public String getSTART_DATE() {
+        return START_DATE;
+    }
+
+    public void setSTART_DATE(String START_DATE) {
+        this.START_DATE = START_DATE;
+    }
+
+    @Column(name="END_DATE")
+    public String getEND_DATE() {
+        return END_DATE;
+    }
+
+    public void setEND_DATE(String END_DATE) {
+        this.END_DATE = END_DATE;
+    }
+
+    @Column(name="FREQUENCY")
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    @Column(name="STATE")
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    @Column(name="RESPONSIBLE_DEPT")
+    public String getRESPONSIBLE_DEPT() {
+        return RESPONSIBLE_DEPT;
+    }
+
+    public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+        this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+    }
+
+    @Column(name="PLAN_NO")
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    @Column(name="INSPECTION_TYPE")
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    @Column(name="INSPECTION_MODE")
+    public String getINSPECTION_MODE() {
+        return INSPECTION_MODE;
+    }
+
+    public void setINSPECTION_MODE(String INSPECTION_MODE) {
+        this.INSPECTION_MODE = INSPECTION_MODE;
+    }
+
+    @Column(name="INSPECTION_ROUTE")
+    public String getINSPECTION_ROUTE() {
+        return INSPECTION_ROUTE;
+    }
+
+    public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+        this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+    }
+
+    @Column(name="INSPECTION_START_TIME")
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    @Column(name="INSPECTION_END_TIME")
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    @Column(name="INSPECTION_PRACE")
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    @Column(name="INSPECTION_GROUP")
+    public String getINSPECTION_GROUP() {
+        return INSPECTION_GROUP;
+    }
+
+    public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+        this.INSPECTION_GROUP = INSPECTION_GROUP;
+    }
+
+    @Column(name="INSERT_TIME")
+    public String getINSERT_TIME() {
+        return INSERT_TIME;
+    }
+
+    public void setINSERT_TIME(String INSERT_TIME) {
+        this.INSERT_TIME = INSERT_TIME;
+    }
+
+    @Column(name="FREQUENCYDATE")
+    public String getFREQUENCYDATE() {
+        return FREQUENCYDATE;
+    }
+
+    public void setFREQUENCYDATE(String FREQUENCYDATE) {
+        this.FREQUENCYDATE = FREQUENCYDATE;
+    }
+
+    @Column(name="FREQUENCYTIME")
+    public String getFREQUENCYTIME() {
+        return FREQUENCYTIME;
+    }
+
+    public void setFREQUENCYTIME(String FREQUENCYTIME) {
+        this.FREQUENCYTIME = FREQUENCYTIME;
+    }
+
+    @Column(name="CREATEDATE")
+    public String getCREATEDATE() {
+        return CREATEDATE;
+    }
+
+    public void setCREATEDATE(String CREATEDATE) {
+        this.CREATEDATE = CREATEDATE;
+    }
+
+    @Column(name="CREATOR")
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    @Column(name="PROJECT")
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    @Column(name="COMLILE")
+    public String getCOMLILE() {
+        return COMLILE;
+    }
+
+    public void setCOMLILE(String COMLILE) {
+        this.COMLILE = COMLILE;
+    }
+
+    @Column(name="START_TIME")
+    public String getSTART_TIME() {
+        return START_TIME;
+    }
+
+    public void setSTART_TIME(String START_TIME) {
+        this.START_TIME = START_TIME;
+    }
+
+    @Column(name="DEVELOP_DEPT")
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    @Column(name="END_TIME")
+    public String getEND_TIME() {
+        return END_TIME;
+    }
+
+    public void setEND_TIME(String END_TIME) {
+        this.END_TIME = END_TIME;
+    }
+
+    @Column(name="START_PILE_NO")
+    public String getSTART_PILE_NO() {
+        return START_PILE_NO;
+    }
+
+    public void setSTART_PILE_NO(String START_PILE_NO) {
+        this.START_PILE_NO = START_PILE_NO;
+    }
+
+    @Column(name="END_PILE_NO")
+    public String getEND_PILE_NO() {
+        return END_PILE_NO;
+    }
+
+    public void setEND_PILE_NO(String END_PILE_NO) {
+        this.END_PILE_NO = END_PILE_NO;
+    }
+
+    @Column(name="BUILD_CABIN")
+    public String getBUILD_CABIN() {
+        return BUILD_CABIN;
+    }
+
+    public void setBUILD_CABIN(String BUILD_CABIN) {
+        this.BUILD_CABIN = BUILD_CABIN;
+    }
+
+    @Column(name="MILEAGE")
+    public String getMILEAGE() {
+        return MILEAGE;
+    }
+
+    public void setMILEAGE(String MILEAGE) {
+        this.MILEAGE = MILEAGE;
+    }
+
+    @Column(name="FREQUENCY_TIME")
+    public String getFREQUENCY_TIME() {
+        return FREQUENCY_TIME;
+    }
+
+    public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+        this.FREQUENCY_TIME = FREQUENCY_TIME;
+    }
+
+    @Column(name="FREQUENCYTIME_END")
+    public String getFREQUENCYTIME_END() {
+        return FREQUENCYTIME_END;
+    }
+
+    public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+        this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+    }
+
+    @Column(name="KETTLE_TS")
+    public String getKETTLE_TS() {
+        return KETTLE_TS;
+    }
+
+    public void setKETTLE_TS(String KETTLE_TS) {
+        this.KETTLE_TS = KETTLE_TS;
+    }
+
+    @Column(name="UPDATEDATE")
+    public String getUPDATEDATE() {
+        return UPDATEDATE;
+    }
+
+    public void setUPDATEDATE(String UPDATEDATE) {
+        this.UPDATEDATE = UPDATEDATE;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 5346b57..2f8d359 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -66,7 +66,7 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REPAIRMAN")
+    @Column(name="REOAIRMAN")
     public String getRepairMan() {
         return repairMan;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
-    private Long id;
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-
-
-    public static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
-        PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
-        pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
-        pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
-        pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
-        pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
-        pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
-        pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
-        pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
-        pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
-        pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
-        pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
-        pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
-        pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
-        pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
-        pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
-        return pgAssetInSpectionRecordDto;
-    }
-
-
-    public static List<PgAssetInSpectionRecordDto> ConvertToDtoList(List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList){
-        List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-        for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
-            pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
-        }
-
-        return pgAssetInSpectionRecordDtoList;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
-    private String num;
-    private String createDate;
-
-    public String getNum() {
-        return num;
-    }
-
-    public void setNum(String num) {
-        this.num = num;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+    private Long id;
+    private String PLAN_NO;//巡检计划编号
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String FREQUENCY;//巡检频率
+    private String CREATOR;//创建人
+    private String DEVELOP_DEPT;//制定部门
+    private String PROJECT;//项目
+    private String STATE;//状态
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+        PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+        pgAssetPlanDto.setId(pgAssetPlan.getId());
+        pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+        pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+        pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+        pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+        pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+        pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+        pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+        pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+        pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+        pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+        pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+        return pgAssetPlanDto;
+    }
+
+    public static List<PgAssetPlanDto> ConvertToPgAssetDtoList(List<PgAssetPlan> pgAssetPlanList){
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
+
+        for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+            pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+        }
+
+        return pgAssetPlanDtoList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
new file mode 100644
index 0000000..bc12db1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
@@ -0,0 +1,24 @@
+package com.casic.PgInterface.maintenance.dto;
+
+public class PgAssetPlanStatic {
+
+    private String num;
+    private String createDate;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
deleted file mode 100644
index c41ca7d..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.casic.PgInterface.maintenance.manager;
-
-import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
-
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
-        try {
-            String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
-                    "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
-                    "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-
-            if(patrolMan!=null)
-                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
-            if(startTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
-            if(endTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')<to_date('"+endTime+"','yyyy-MM-dd')";
-
-            sql+=" order by id";
-
-            List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
-
-            List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList=new ArrayList<>();
-            for(Object[] objects1:objects){
-                PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord();
-
-                pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString()));
-                pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1]));
-                pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2]));
-                pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3]));
-                pgAssetInSpectionRecord.setState(String.valueOf(objects1[4]));
-                pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5]));
-                pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6]));
-                pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7]));
-                pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8]));
-                pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9]));
-                pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10]));
-                pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11]));
-                pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12]));
-                pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13]));
-                pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14]));
-                pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15]));
-                pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16]));
-                pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17]));
-                pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18]));
-                pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19]));
-
-                pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord);
-            }
-
-            List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-            for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList)
-            {
-                pgAssetInSpectionRecordDtoList.add(PgAssetInSpectionRecordDto.ConvertToDto(pgAssetInSpectionRecord));
-            }
-
-            return pgAssetInSpectionRecordDtoList;
-        }
-        catch(Exception e)
-        {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public List<PgAssetInSpectionRecordStatic> getPgAssetInSpectionRecordStaticLisByTime(
-            String startTime, String endTime, String staticType) {
-
-        String sql="";
-        String dateType="";
-        List<PgAssetInSpectionRecordStatic> pgAssetInSpectionRecordStaticList=new ArrayList<>();
-        int type=Integer.valueOf(staticType);
-
-        switch(type) {
-            case 0://年
-                dateType = "yyyy";
-                break;
-            case 1://月
-                dateType = "yyyy-mm";
-                break;
-            case 2://周
-                dateType = "iw";
-                break;
-            case 3://日
-                dateType="yyyy-mm-dd";
-                break;
-            default:
-                break;
-        }
-
-        sql="select count(*), to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_RECORD t where 1=1";
-
-        if(startTime!=null)
-            sql+=" and t.CREATE_DATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
-        if(endTime!=null)
-            sql+=" and t.CREATE_DATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
-
-        sql+=" group by to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"')";
-
-        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
-        for(int i=0;i<objects.size();i++)
-        {
-            PgAssetInSpectionRecordStatic pgAssetInSpectionRecordStatic=new PgAssetInSpectionRecordStatic();
-            pgAssetInSpectionRecordStatic.setNum(objects.get(i)[0].toString());
-            pgAssetInSpectionRecordStatic.setCreateDate(objects.get(i)[1].toString());
-            pgAssetInSpectionRecordStaticList.add(pgAssetInSpectionRecordStatic);
-        }
-        return pgAssetInSpectionRecordStaticList;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
new file mode 100644
index 0000000..bb6bf1e
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
@@ -0,0 +1,81 @@
+package com.casic.PgInterface.maintenance.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgAssetPlanManager extends HibernateEntityDao<PgAssetPlan> {
+
+    public List<PgAssetPlanDto> getPgAssetPlanDtoList(String inSpectionPlace){
+        Criteria criteria=createCriteria(PgAssetPlan.class);
+
+        if(StringUtils.isNotBlank(inSpectionPlace))
+            criteria.add(Restrictions.like("INSPECTION_PRACE","%"+inSpectionPlace+"%"));
+        criteria.addOrder(Order.desc("id"));
+
+        List<PgAssetPlan> pgAssetPlanList=criteria.list();
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=PgAssetPlanDto.ConvertToPgAssetDtoList(pgAssetPlanList);
+
+        if(pgAssetPlanDtoList==null||pgAssetPlanDtoList.size()==0)
+            return null;
+        else
+            return pgAssetPlanDtoList;
+    }
+
+    public List<PgAssetPlanStatic> getPgAssetPlanStaticLisByTime(
+            String startTime, String endTime, String staticType) {
+
+        String sql="";
+        String dateType="";
+        List<PgAssetPlanStatic> pgAssetPlanStaticList=new ArrayList<>();
+        int type=Integer.valueOf(staticType);
+
+        switch(type) {
+            case 0://年
+                dateType = "yyyy";
+                break;
+            case 1://月
+                dateType = "yyyy-mm";
+                break;
+            case 2://周
+                dateType = "iw";
+                break;
+            case 3://日
+                dateType="yyyy-mm-dd";
+                break;
+            default:
+                break;
+        }
+
+        sql="select count(*), to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_PLAN t where 1=1";
+
+        if(startTime!=null)
+            sql+=" and t.CREATEDATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
+        if(endTime!=null)
+            sql+=" and t.CREATEDATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
+
+        sql+=" group by to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"')";
+
+        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
+        for(int i=0;i<objects.size();i++)
+        {
+            PgAssetPlanStatic pgAssetPlanStatic=new PgAssetPlanStatic();
+            pgAssetPlanStatic.setNum(objects.get(i)[0].toString());
+            pgAssetPlanStatic.setCreateDate(objects.get(i)[1].toString());
+            pgAssetPlanStaticList.add(pgAssetPlanStatic);
+        }
+        return pgAssetPlanStaticList;
+    }
+
+}

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ff69e2a..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,27 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190828.docx" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -32,72 +42,119 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="2" />
-          <entry key="java" value="243" />
-          <entry key="properties" value="6" />
+          <entry key="java" value="321" />
+          <entry key="properties" value="8" />
           <entry key="xml" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
-          <entry key="JAVA" value="243" />
-          <entry key="Properties" value="6" />
+          <entry key="JAVA" value="321" />
+          <entry key="Properties" value="8" />
           <entry key="XML" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="8082" />
-          <entry key="properties" value="49" />
-          <entry key="txt" value="64" />
+          <entry key="dummy" value="16" />
+          <entry key="java" value="10723" />
+          <entry key="properties" value="59" />
+          <entry key="txt" value="118" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="8082" />
-          <entry key="PLAIN_TEXT" value="64" />
-          <entry key="Properties" value="49" />
+          <entry key="JAVA" value="10723" />
+          <entry key="PLAIN_TEXT" value="134" />
+          <entry key="Properties" value="59" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="4" />
+          <entry key="project.closed" value="28" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
           <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.24" value="1" />
+          <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="1" />
-          <entry key="project.open.time.3" value="3" />
-          <entry key="project.open.time.31" value="1" />
+          <entry key="project.open.time.28" value="1" />
+          <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.31" value="2" />
           <entry key="project.open.time.37" value="1" />
+          <entry key="project.open.time.39" value="2" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.40" value="1" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="1" />
+          <entry key="project.open.time.44" value="2" />
           <entry key="project.open.time.45" value="2" />
           <entry key="project.open.time.48" value="1" />
           <entry key="project.open.time.49" value="1" />
+          <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.58" value="1" />
           <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.71" value="1" />
+          <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.71" value="2" />
           <entry key="project.open.time.76" value="1" />
-          <entry key="project.opened" value="25" />
+          <entry key="project.opened" value="41" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+            <state relative-caret-position="174">
+              <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
               <folding>
-                <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-                <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="352">
+              <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#787#788#0" expanded="true" />
+                <element signature="e#817#818#0" expanded="true" />
+                <element signature="e#2105#2106#0" expanded="true" />
+                <element signature="e#2135#2136#0" expanded="true" />
+                <element signature="e#2431#2432#0" expanded="true" />
+                <element signature="e#2461#2462#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="638">
+              <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+              <folding>
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -122,6 +179,7 @@
       <find>getPgDeviceByDevType</find>
       <find>message</find>
       <find>getConstructionByType</find>
+      <find>getPgCameraListByPosition</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -130,24 +188,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanTypeDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
@@ -162,17 +207,38 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
       </list>
     </option>
   </component>
@@ -208,16 +274,18 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="3" />
-    <option name="y" value="10" />
-    <option name="width" value="1386" />
-    <option name="height" value="788" />
+    <option name="x" value="1410" />
+    <option name="y" value="117" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -258,7 +326,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -267,16 +335,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -286,7 +345,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="dto" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -296,7 +355,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="manager" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -308,19 +367,10 @@
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="webapp" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -359,6 +409,7 @@
       </deployment>
       <server-settings>
         <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_7" />
+        <option name="JNDI_PORT" value="10991" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -456,7 +507,23 @@
       <workItem from="1566350810712" duration="6803000" />
       <workItem from="1566435787074" duration="10717000" />
       <workItem from="1566521753529" duration="14265000" />
-      <workItem from="1566614176989" duration="5693000" />
+      <workItem from="1566614176989" duration="14059000" />
+      <workItem from="1566780822009" duration="1026000" />
+      <workItem from="1566891563975" duration="284000" />
+      <workItem from="1566893107340" duration="3382000" />
+      <workItem from="1566953794976" duration="11039000" />
+      <workItem from="1567059357700" duration="484000" />
+      <workItem from="1567082835097" duration="1086000" />
+      <workItem from="1567126428020" duration="1539000" />
+      <workItem from="1567129277820" duration="5788000" />
+      <workItem from="1567136008996" duration="2568000" />
+      <workItem from="1567237040302" duration="111000" />
+      <workItem from="1567495626345" duration="2797000" />
+      <workItem from="1567558770152" duration="2352000" />
+      <workItem from="1567577368149" duration="640000" />
+      <workItem from="1567751224608" duration="780000" />
+      <workItem from="1568019299799" duration="695000" />
+      <workItem from="1568082566133" duration="4016000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -493,17 +560,60 @@
       <option name="project" value="LOCAL" />
       <updated>1566553388171</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="整理管线部分">
+      <created>1566620046627</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1566620046627</updated>
+    </task>
+    <task id="LOCAL-00007" summary="合并代码提交">
+      <created>1566781001910</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1566781001910</updated>
+    </task>
+    <task id="LOCAL-00008" summary="合并代码提交">
+      <created>1566963831930</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1566963831930</updated>
+    </task>
+    <task id="LOCAL-00009" summary="修改报警阈值">
+      <created>1566972146710</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1566972146710</updated>
+    </task>
+    <task id="LOCAL-00010" summary="修改巡检维护表字段">
+      <created>1567126525554</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1567126525554</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="142930000" />
+    <option name="totallyTimeSpent" value="189883000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
+    <frame x="1358" y="-8" width="1456" height="916" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29297996" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -511,13 +621,14 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Thumbnails" weight="0.3295082" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.5081967" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.3849105" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
       <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
       <window_info anchor="bottom" id="Spring" order="8" />
       <window_info anchor="bottom" id="Terminal" order="9" />
@@ -539,7 +650,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2193646" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -547,22 +658,23 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.47540984" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
-      <window_info anchor="bottom" id="Spring" order="8" />
-      <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
-      <window_info anchor="bottom" id="Statistic" order="11" />
-      <window_info anchor="bottom" id="Java Enterprise" order="12" />
-      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="14" weight="0.32786885" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.52307695" />
+      <window_info anchor="bottom" id="Thumbnails" order="0" weight="0.3295082" />
+      <window_info anchor="bottom" id="Message" order="1" />
+      <window_info anchor="bottom" id="Find" order="2" />
+      <window_info anchor="bottom" id="Run" order="3" />
+      <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.49924356" weight="0.49344262" />
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Application Servers" order="8" weight="0.3276923" />
+      <window_info anchor="bottom" id="Spring" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
+      <window_info anchor="bottom" id="Statistic" order="12" />
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <window_info anchor="bottom" id="Database Changes" order="14" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="15" weight="0.32786885" />
+      <window_info anchor="bottom" id="Messages" order="16" weight="0.5229508" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -578,6 +690,16 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -587,7 +709,11 @@
     <MESSAGE value="修改权限问题" />
     <MESSAGE value="修改人员登录返回接口" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整理管线部分" />
+    <MESSAGE value="合并代码提交" />
+    <MESSAGE value="修改报警阈值" />
+    <MESSAGE value="修改巡检维护表字段" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护表字段" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -602,322 +728,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-532">
-          <caret line="50" column="28" lean-forward="true" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="19" column="60" selection-start-line="19" selection-start-column="60" selection-end-line="19" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="100" column="34" lean-forward="true" selection-start-line="100" selection-start-column="34" selection-end-line="100" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1474">
-          <caret line="84" column="58" selection-start-line="84" selection-start-column="58" selection-end-line="84" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1100">
-          <caret line="58" column="18" selection-start-line="58" selection-start-column="18" selection-end-line="58" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6842">
-          <caret line="329" selection-start-line="329" selection-end-line="329" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="102" column="24" lean-forward="true" selection-start-line="102" selection-start-column="24" selection-end-line="102" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="72" column="56" lean-forward="true" selection-start-line="72" selection-start-column="56" selection-end-line="72" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="90" column="39" lean-forward="true" selection-start-line="90" selection-start-column="39" selection-end-line="90" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="97" column="16" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
-          <caret line="14" column="52" lean-forward="true" selection-start-line="14" selection-start-column="52" selection-end-line="14" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="26" column="34" lean-forward="true" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="61" column="1" lean-forward="true" selection-start-line="61" selection-start-column="1" selection-end-line="61" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="208" column="49" lean-forward="true" selection-start-line="208" selection-start-column="49" selection-end-line="208" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="140" column="57" selection-start-line="140" selection-start-column="57" selection-end-line="140" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="111" column="36" selection-start-line="111" selection-start-column="36" selection-end-line="111" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="3" lean-forward="true" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="81" column="58" lean-forward="true" selection-start-line="81" selection-start-column="58" selection-end-line="81" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="472">
-          <caret line="118" column="59" selection-start-line="118" selection-start-column="59" selection-end-line="118" selection-end-column="59" />
-          <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-198">
-          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="69" column="32" lean-forward="true" selection-start-line="69" selection-start-column="32" selection-end-line="70" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="142" column="59" lean-forward="true" selection-start-line="142" selection-start-column="59" selection-end-line="142" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="349" column="9" lean-forward="true" selection-start-line="349" selection-start-column="9" selection-end-line="349" selection-end-column="9" />
-          <folding>
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="e#12105#12121#0" expanded="true" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-686">
-          <caret line="67" column="31" lean-forward="true" selection-start-line="67" selection-start-column="31" selection-end-line="67" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="93" column="24" lean-forward="true" selection-start-line="93" selection-start-column="24" selection-end-line="93" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="57" column="23" lean-forward="true" selection-start-line="57" selection-start-column="23" selection-end-line="57" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-408">
-          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="98" column="40" lean-forward="true" selection-start-line="98" selection-start-column="40" selection-end-line="98" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="572">
@@ -925,13 +735,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="328" column="32" lean-forward="true" selection-start-line="328" selection-start-column="32" selection-end-line="328" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
@@ -950,16 +753,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="396">
           <caret line="23" column="32" lean-forward="true" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
-          <folding>
-            <element signature="e#2635#2636#0" expanded="true" />
-            <element signature="e#2671#2672#0" expanded="true" />
-            <element signature="e#2727#2728#0" expanded="true" />
-            <element signature="e#2777#2778#0" expanded="true" />
-            <element signature="e#2877#2878#0" expanded="true" />
-            <element signature="e#2911#2912#0" expanded="true" />
-            <element signature="e#2963#2964#0" expanded="true" />
-            <element signature="e#3009#3010#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -972,14 +765,481 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+        <state relative-caret-position="66">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="59" column="46" lean-forward="true" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3586">
+          <caret line="179" column="16" selection-start-line="179" selection-start-column="16" selection-end-line="179" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5478">
+          <caret line="273" column="3" selection-start-line="273" selection-start-column="3" selection-end-line="273" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1870">
+          <caret line="147" column="11" selection-start-line="147" selection-start-column="11" selection-end-line="147" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="55" column="15" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="106">
+          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="290" column="41" lean-forward="true" selection-start-line="290" selection-start-column="41" selection-end-line="290" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="21" column="32" lean-forward="true" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="550">
+          <caret line="38" column="89" selection-start-line="38" selection-start-column="89" selection-end-line="38" selection-end-column="89" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="11" column="28" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1166">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="818">
+          <caret line="285" column="13" lean-forward="true" selection-start-line="285" selection-start-column="13" selection-end-line="285" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="129" column="31" lean-forward="true" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="323" column="72" lean-forward="true" selection-start-line="323" selection-start-column="72" selection-end-line="323" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="44" column="13" lean-forward="true" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-638">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="244">
+          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="157">
+          <caret line="16" column="55" lean-forward="true" selection-start-line="16" selection-start-column="55" selection-end-line="16" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="270" column="33" lean-forward="true" selection-start-line="270" selection-start-column="33" selection-end-line="270" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="490">
+          <caret line="141" selection-start-line="141" selection-end-line="141" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="164" column="5" lean-forward="true" selection-start-line="164" selection-start-column="5" selection-end-line="164" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/apiTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-242">
+          <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="61" column="16" lean-forward="true" selection-start-line="61" selection-start-column="16" selection-end-line="61" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="700">
+          <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="12" column="34" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="39" column="9" lean-forward="true" selection-start-line="39" selection-start-column="9" selection-end-line="39" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="32" column="29" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="29" />
           <folding>
-            <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-            <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#1838#1839#0" expanded="true" />
+            <element signature="e#1863#1864#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1925#1926#0" expanded="true" />
+            <element signature="e#1822#1823#0" expanded="true" />
+            <element signature="e#1851#1852#0" expanded="true" />
+            <element signature="e#1895#1896#0" expanded="true" />
+            <element signature="e#1931#1932#0" expanded="true" />
+            <element signature="e#2132#2133#0" expanded="true" />
+            <element signature="e#2164#2165#0" expanded="true" />
+            <element signature="e#2214#2215#0" expanded="true" />
+            <element signature="e#2256#2257#0" expanded="true" />
+            <element signature="e#2330#2331#0" expanded="true" />
+            <element signature="e#2370#2371#0" expanded="true" />
+            <element signature="e#2436#2437#0" expanded="true" />
+            <element signature="e#2494#2495#0" expanded="true" />
+            <element signature="e#2569#2570#0" expanded="true" />
+            <element signature="e#2602#2603#0" expanded="true" />
+            <element signature="e#2654#2655#0" expanded="true" />
+            <element signature="e#2698#2699#0" expanded="true" />
+            <element signature="e#2764#2765#0" expanded="true" />
+            <element signature="e#2795#2796#0" expanded="true" />
+            <element signature="e#2843#2844#0" expanded="true" />
+            <element signature="e#2883#2884#0" expanded="true" />
+            <element signature="e#2948#2949#0" expanded="true" />
+            <element signature="e#2980#2981#0" expanded="true" />
+            <element signature="e#3030#3031#0" expanded="true" />
+            <element signature="e#3072#3073#0" expanded="true" />
+            <element signature="e#3134#3135#0" expanded="true" />
+            <element signature="e#3162#3163#0" expanded="true" />
+            <element signature="e#3204#3205#0" expanded="true" />
+            <element signature="e#3238#3239#0" expanded="true" />
+            <element signature="e#3307#3308#0" expanded="true" />
+            <element signature="e#3346#3347#0" expanded="true" />
+            <element signature="e#3410#3411#0" expanded="true" />
+            <element signature="e#3466#3467#0" expanded="true" />
+            <element signature="e#3537#3538#0" expanded="true" />
+            <element signature="e#3567#3568#0" expanded="true" />
+            <element signature="e#3613#3614#0" expanded="true" />
+            <element signature="e#3651#3652#0" expanded="true" />
+            <element signature="e#3721#3722#0" expanded="true" />
+            <element signature="e#3759#3760#0" expanded="true" />
+            <element signature="e#3821#3822#0" expanded="true" />
+            <element signature="e#3875#3876#0" expanded="true" />
+            <element signature="e#3953#3954#0" expanded="true" />
+            <element signature="e#3991#3992#0" expanded="true" />
+            <element signature="e#4053#4054#0" expanded="true" />
+            <element signature="e#4107#4108#0" expanded="true" />
+            <element signature="e#4186#4187#0" expanded="true" />
+            <element signature="e#4225#4226#0" expanded="true" />
+            <element signature="e#4289#4290#0" expanded="true" />
+            <element signature="e#4345#4346#0" expanded="true" />
+            <element signature="e#4430#4431#0" expanded="true" />
+            <element signature="e#4474#4475#0" expanded="true" />
+            <element signature="e#4698#4699#0" expanded="true" />
+            <element signature="e#4740#4741#0" expanded="true" />
+            <element signature="e#4810#4811#0" expanded="true" />
+            <element signature="e#4872#4873#0" expanded="true" />
+            <element signature="e#4955#4956#0" expanded="true" />
+            <element signature="e#4994#4995#0" expanded="true" />
+            <element signature="e#5058#5059#0" expanded="true" />
+            <element signature="e#5114#5115#0" expanded="true" />
+            <element signature="e#5194#5195#0" expanded="true" />
+            <element signature="e#5233#5234#0" expanded="true" />
+            <element signature="e#5297#5298#0" expanded="true" />
+            <element signature="e#5353#5354#0" expanded="true" />
+            <element signature="e#5428#5429#0" expanded="true" />
+            <element signature="e#5462#5463#0" expanded="true" />
+            <element signature="e#5516#5517#0" expanded="true" />
+            <element signature="e#5562#5563#0" expanded="true" />
+            <element signature="e#5634#5635#0" expanded="true" />
+            <element signature="e#5670#5671#0" expanded="true" />
+            <element signature="e#5728#5729#0" expanded="true" />
+            <element signature="e#5778#5779#0" expanded="true" />
+            <element signature="e#5852#5853#0" expanded="true" />
+            <element signature="e#5888#5889#0" expanded="true" />
+            <element signature="e#5946#5947#0" expanded="true" />
+            <element signature="e#5996#5997#0" expanded="true" />
+            <element signature="e#6067#6068#0" expanded="true" />
+            <element signature="e#6100#6101#0" expanded="true" />
+            <element signature="e#6152#6153#0" expanded="true" />
+            <element signature="e#6196#6197#0" expanded="true" />
+            <element signature="e#6261#6262#0" expanded="true" />
+            <element signature="e#6291#6292#0" expanded="true" />
+            <element signature="e#6337#6338#0" expanded="true" />
+            <element signature="e#6375#6376#0" expanded="true" />
+            <element signature="e#6437#6438#0" expanded="true" />
+            <element signature="e#6467#6468#0" expanded="true" />
+            <element signature="e#6513#6514#0" expanded="true" />
+            <element signature="e#6551#6552#0" expanded="true" />
+            <element signature="e#6613#6614#0" expanded="true" />
+            <element signature="e#6643#6644#0" expanded="true" />
+            <element signature="e#6689#6690#0" expanded="true" />
+            <element signature="e#6727#6728#0" expanded="true" />
+            <element signature="e#6796#6797#0" expanded="true" />
+            <element signature="e#6829#6830#0" expanded="true" />
+            <element signature="e#6881#6882#0" expanded="true" />
+            <element signature="e#6925#6926#0" expanded="true" />
+            <element signature="e#6995#6996#0" expanded="true" />
+            <element signature="e#7030#7031#0" expanded="true" />
+            <element signature="e#7086#7087#0" expanded="true" />
+            <element signature="e#7134#7135#0" expanded="true" />
+            <element signature="e#7202#7203#0" expanded="true" />
+            <element signature="e#7233#7234#0" expanded="true" />
+            <element signature="e#7281#7282#0" expanded="true" />
+            <element signature="e#7321#7322#0" expanded="true" />
+            <element signature="e#7390#7391#0" expanded="true" />
+            <element signature="e#7426#7427#0" expanded="true" />
+            <element signature="e#7484#7485#0" expanded="true" />
+            <element signature="e#7534#7535#0" expanded="true" />
+            <element signature="e#7602#7603#0" expanded="true" />
+            <element signature="e#7636#7637#0" expanded="true" />
+            <element signature="e#7690#7691#0" expanded="true" />
+            <element signature="e#7736#7737#0" expanded="true" />
+            <element signature="e#7806#7807#0" expanded="true" />
+            <element signature="e#7840#7841#0" expanded="true" />
+            <element signature="e#7894#7895#0" expanded="true" />
+            <element signature="e#7940#7941#0" expanded="true" />
+            <element signature="e#8006#8007#0" expanded="true" />
+            <element signature="e#8036#8037#0" expanded="true" />
+            <element signature="e#8082#8083#0" expanded="true" />
+            <element signature="e#8120#8121#0" expanded="true" />
+            <element signature="e#8189#8190#0" expanded="true" />
+            <element signature="e#8226#8227#0" expanded="true" />
+            <element signature="e#8286#8287#0" expanded="true" />
+            <element signature="e#8338#8339#0" expanded="true" />
+            <element signature="e#8417#8418#0" expanded="true" />
+            <element signature="e#8457#8458#0" expanded="true" />
+            <element signature="e#8523#8524#0" expanded="true" />
+            <element signature="e#8581#8582#0" expanded="true" />
+            <element signature="e#8655#8656#0" expanded="true" />
+            <element signature="e#8687#8688#0" expanded="true" />
+            <element signature="e#8737#8738#0" expanded="true" />
+            <element signature="e#8779#8780#0" expanded="true" />
+            <element signature="e#8846#8847#0" expanded="true" />
+            <element signature="e#8879#8880#0" expanded="true" />
+            <element signature="e#8931#8932#0" expanded="true" />
+            <element signature="e#8975#8976#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#787#788#0" expanded="true" />
+            <element signature="e#817#818#0" expanded="true" />
+            <element signature="e#2105#2106#0" expanded="true" />
+            <element signature="e#2135#2136#0" expanded="true" />
+            <element signature="e#2431#2432#0" expanded="true" />
+            <element signature="e#2461#2462#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index 854f1f1..0db633a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -165,12 +165,16 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String startDay,String endDay) {
+    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew) {
         try {
 
             Criteria criteria = createCriteria(PgAlarm.class);
             criteria.addOrder(Order.desc("id"));
 
+            if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) {
+                criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
+            }
+
             if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay))
             {
                 criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay)));
@@ -193,9 +197,11 @@
 
                 criteria.add(Restrictions.le("alarmDate",date));
             }
+            if(StringUtils.isNotBlank(isNew)&&isNew.equals("true"))
+                criteria.add(Restrictions.eq("active", 1));
 
             List<PgAlarm> pgAlarmList = criteria.list();
-            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
     }
 
     //根据设备位置(仓位)获取摄像机列表
-    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+    public List<PgDeviceDto> getPgCameraListByPosition(String partition,String position){
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.like("position",position+"%"));
-//        criteria.add(Restrictions.eq("devType","球机"));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(position))
+            criteria.add(Restrictions.like("position",position+"%"));
+
         criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
 
         List<PgDevice> pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
             dto.setDevCode(objects[5].toString());
             dto.setDevType(objects[6].toString());
             if(objects[7]!=null)
-            dto.setIp(objects[7].toString());
+                dto.setIp(objects[7].toString());
             dto.setIsOpen(objects[8].toString());
             dto.setPartition(objects[11].toString());
             dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index 8ebf74d..3c657a7 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgEquipment;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
 import com.casic.PgInterface.devTable.dto.PgEquipmentDto;
@@ -34,9 +35,12 @@
     public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
-        criteria.add(Restrictions.eq("eqName",eqName));
-        criteria.add(Restrictions.eq("eqCode",eqCode));
-        criteria.add(Restrictions.eq("eqType",eqType));
+        if(StringUtils.isNotBlank(eqName))
+            criteria.add(Restrictions.eq("eqName",eqName));
+        if(StringUtils.isNotBlank(eqCode))
+            criteria.add(Restrictions.eq("eqCode",eqCode));
+        if(StringUtils.isNotBlank(eqType))
+            criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
@@ -51,10 +55,9 @@
 
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
-        //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
         String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
-        +eqType+"' group by equipment.EQ_NAME";
+                +eqType+"' group by equipment.EQ_NAME";
 
         List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4ed68e4..e413a5c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
@@ -39,7 +40,8 @@
 
     public List<PgPipeLineDto> getPipeLineByLineType(String lineType) {
         Criteria criteria = createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineType", lineType));
+        if(StringUtils.isNotBlank(lineType))
+            criteria.add(Restrictions.eq("lineType", lineType));
 
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    private Long id;
-    private String keyId;//巡检记录单id
-    private String planId;//巡检计划ID
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    @Column(name="KEY_ID")
-    public String getKeyId() {
-        return keyId;
-    }
-
-    public void setKeyId(String keyId) {
-        this.keyId = keyId;
-    }
-
-    @Column(name="PLAN_ID")
-    public String getPlanId() {
-        return planId;
-    }
-
-    public void setPlanId(String planId) {
-        this.planId = planId;
-    }
-
-    @Column(name="CREATE_DATE")
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    @Column(name="STATE")
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    @Column(name="CREATOR")
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    @Column(name="PLAN_NAME")
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    @Column(name="RECORD_NO")
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    @Column(name="PLAN_NO")
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    @Column(name="RESPONSIBIE_DEPT")
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    @Column(name="INSPECTION_PERSON")
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    @Column(name="PATROL_MAN")
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    @Column(name="OPERATE_DATE")
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    @Column(name="REMARK")
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Column(name="BUILD_CABIN")
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    @Column(name="PROJECT")
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    @Column(name="START_PILE_NO")
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    @Column(name="END_PILE_NO")
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    @Column(name="INSPECTION_PRACE")
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    @Column(name="OTHER_PATROL_MAN")
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private Long id;
+    private String KEY_ID;//唯一键值
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_PERSON;//巡检人
+    private String START_DATE;//巡检开始时间
+    private String END_DATE;
+    private String FREQUENCY;//巡检频率
+    private String STATE;//状态
+    private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+    private String PLAN_NO;//巡检计划编号
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_MODE;//巡检方式
+    private String INSPECTION_ROUTE;//巡检路线
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String INSPECTION_GROUP;//巡检部门
+    private String INSERT_TIME;//插入时间
+    private String FREQUENCYDATE;//巡检具体日期
+    private String FREQUENCYTIME;//巡检具体时间
+    private String CREATEDATE;//创建时间
+    private String CREATOR;//创建人
+    private String PROJECT;//项目
+    private String COMLILE;//编制人
+    private String START_TIME;//编制时间
+    private String DEVELOP_DEPT;//制定部门
+    private String END_TIME;//结束时间
+    private String START_PILE_NO;//开始桩号
+    private String END_PILE_NO;//结束桩号
+    private String BUILD_CABIN;//巡检舱室
+    private String MILEAGE;
+    private String FREQUENCY_TIME;//巡检具体时间
+    private String FREQUENCYTIME_END;
+    private String KETTLE_TS;
+    private String UPDATEDATE;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="KEY_ID")
+    public String getKEY_ID() {
+        return KEY_ID;
+    }
+
+    public void setKEY_ID(String KEY_ID) {
+        this.KEY_ID = KEY_ID;
+    }
+
+    @Column(name="PLAN_NAME")
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    @Column(name="INSPECTION_PERSON")
+    public String getINSPECTION_PERSON() {
+        return INSPECTION_PERSON;
+    }
+
+    public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+        this.INSPECTION_PERSON = INSPECTION_PERSON;
+    }
+
+    @Column(name="START_DATE")
+    public String getSTART_DATE() {
+        return START_DATE;
+    }
+
+    public void setSTART_DATE(String START_DATE) {
+        this.START_DATE = START_DATE;
+    }
+
+    @Column(name="END_DATE")
+    public String getEND_DATE() {
+        return END_DATE;
+    }
+
+    public void setEND_DATE(String END_DATE) {
+        this.END_DATE = END_DATE;
+    }
+
+    @Column(name="FREQUENCY")
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    @Column(name="STATE")
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    @Column(name="RESPONSIBLE_DEPT")
+    public String getRESPONSIBLE_DEPT() {
+        return RESPONSIBLE_DEPT;
+    }
+
+    public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+        this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+    }
+
+    @Column(name="PLAN_NO")
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    @Column(name="INSPECTION_TYPE")
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    @Column(name="INSPECTION_MODE")
+    public String getINSPECTION_MODE() {
+        return INSPECTION_MODE;
+    }
+
+    public void setINSPECTION_MODE(String INSPECTION_MODE) {
+        this.INSPECTION_MODE = INSPECTION_MODE;
+    }
+
+    @Column(name="INSPECTION_ROUTE")
+    public String getINSPECTION_ROUTE() {
+        return INSPECTION_ROUTE;
+    }
+
+    public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+        this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+    }
+
+    @Column(name="INSPECTION_START_TIME")
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    @Column(name="INSPECTION_END_TIME")
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    @Column(name="INSPECTION_PRACE")
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    @Column(name="INSPECTION_GROUP")
+    public String getINSPECTION_GROUP() {
+        return INSPECTION_GROUP;
+    }
+
+    public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+        this.INSPECTION_GROUP = INSPECTION_GROUP;
+    }
+
+    @Column(name="INSERT_TIME")
+    public String getINSERT_TIME() {
+        return INSERT_TIME;
+    }
+
+    public void setINSERT_TIME(String INSERT_TIME) {
+        this.INSERT_TIME = INSERT_TIME;
+    }
+
+    @Column(name="FREQUENCYDATE")
+    public String getFREQUENCYDATE() {
+        return FREQUENCYDATE;
+    }
+
+    public void setFREQUENCYDATE(String FREQUENCYDATE) {
+        this.FREQUENCYDATE = FREQUENCYDATE;
+    }
+
+    @Column(name="FREQUENCYTIME")
+    public String getFREQUENCYTIME() {
+        return FREQUENCYTIME;
+    }
+
+    public void setFREQUENCYTIME(String FREQUENCYTIME) {
+        this.FREQUENCYTIME = FREQUENCYTIME;
+    }
+
+    @Column(name="CREATEDATE")
+    public String getCREATEDATE() {
+        return CREATEDATE;
+    }
+
+    public void setCREATEDATE(String CREATEDATE) {
+        this.CREATEDATE = CREATEDATE;
+    }
+
+    @Column(name="CREATOR")
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    @Column(name="PROJECT")
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    @Column(name="COMLILE")
+    public String getCOMLILE() {
+        return COMLILE;
+    }
+
+    public void setCOMLILE(String COMLILE) {
+        this.COMLILE = COMLILE;
+    }
+
+    @Column(name="START_TIME")
+    public String getSTART_TIME() {
+        return START_TIME;
+    }
+
+    public void setSTART_TIME(String START_TIME) {
+        this.START_TIME = START_TIME;
+    }
+
+    @Column(name="DEVELOP_DEPT")
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    @Column(name="END_TIME")
+    public String getEND_TIME() {
+        return END_TIME;
+    }
+
+    public void setEND_TIME(String END_TIME) {
+        this.END_TIME = END_TIME;
+    }
+
+    @Column(name="START_PILE_NO")
+    public String getSTART_PILE_NO() {
+        return START_PILE_NO;
+    }
+
+    public void setSTART_PILE_NO(String START_PILE_NO) {
+        this.START_PILE_NO = START_PILE_NO;
+    }
+
+    @Column(name="END_PILE_NO")
+    public String getEND_PILE_NO() {
+        return END_PILE_NO;
+    }
+
+    public void setEND_PILE_NO(String END_PILE_NO) {
+        this.END_PILE_NO = END_PILE_NO;
+    }
+
+    @Column(name="BUILD_CABIN")
+    public String getBUILD_CABIN() {
+        return BUILD_CABIN;
+    }
+
+    public void setBUILD_CABIN(String BUILD_CABIN) {
+        this.BUILD_CABIN = BUILD_CABIN;
+    }
+
+    @Column(name="MILEAGE")
+    public String getMILEAGE() {
+        return MILEAGE;
+    }
+
+    public void setMILEAGE(String MILEAGE) {
+        this.MILEAGE = MILEAGE;
+    }
+
+    @Column(name="FREQUENCY_TIME")
+    public String getFREQUENCY_TIME() {
+        return FREQUENCY_TIME;
+    }
+
+    public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+        this.FREQUENCY_TIME = FREQUENCY_TIME;
+    }
+
+    @Column(name="FREQUENCYTIME_END")
+    public String getFREQUENCYTIME_END() {
+        return FREQUENCYTIME_END;
+    }
+
+    public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+        this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+    }
+
+    @Column(name="KETTLE_TS")
+    public String getKETTLE_TS() {
+        return KETTLE_TS;
+    }
+
+    public void setKETTLE_TS(String KETTLE_TS) {
+        this.KETTLE_TS = KETTLE_TS;
+    }
+
+    @Column(name="UPDATEDATE")
+    public String getUPDATEDATE() {
+        return UPDATEDATE;
+    }
+
+    public void setUPDATEDATE(String UPDATEDATE) {
+        this.UPDATEDATE = UPDATEDATE;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 5346b57..2f8d359 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -66,7 +66,7 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REPAIRMAN")
+    @Column(name="REOAIRMAN")
     public String getRepairMan() {
         return repairMan;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
-    private Long id;
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-
-
-    public static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
-        PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
-        pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
-        pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
-        pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
-        pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
-        pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
-        pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
-        pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
-        pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
-        pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
-        pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
-        pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
-        pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
-        pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
-        pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
-        return pgAssetInSpectionRecordDto;
-    }
-
-
-    public static List<PgAssetInSpectionRecordDto> ConvertToDtoList(List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList){
-        List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-        for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
-            pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
-        }
-
-        return pgAssetInSpectionRecordDtoList;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
-    private String num;
-    private String createDate;
-
-    public String getNum() {
-        return num;
-    }
-
-    public void setNum(String num) {
-        this.num = num;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+    private Long id;
+    private String PLAN_NO;//巡检计划编号
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String FREQUENCY;//巡检频率
+    private String CREATOR;//创建人
+    private String DEVELOP_DEPT;//制定部门
+    private String PROJECT;//项目
+    private String STATE;//状态
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+        PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+        pgAssetPlanDto.setId(pgAssetPlan.getId());
+        pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+        pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+        pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+        pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+        pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+        pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+        pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+        pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+        pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+        pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+        pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+        return pgAssetPlanDto;
+    }
+
+    public static List<PgAssetPlanDto> ConvertToPgAssetDtoList(List<PgAssetPlan> pgAssetPlanList){
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
+
+        for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+            pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+        }
+
+        return pgAssetPlanDtoList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
new file mode 100644
index 0000000..bc12db1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
@@ -0,0 +1,24 @@
+package com.casic.PgInterface.maintenance.dto;
+
+public class PgAssetPlanStatic {
+
+    private String num;
+    private String createDate;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
deleted file mode 100644
index c41ca7d..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.casic.PgInterface.maintenance.manager;
-
-import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
-
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
-        try {
-            String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
-                    "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
-                    "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-
-            if(patrolMan!=null)
-                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
-            if(startTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
-            if(endTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')<to_date('"+endTime+"','yyyy-MM-dd')";
-
-            sql+=" order by id";
-
-            List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
-
-            List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList=new ArrayList<>();
-            for(Object[] objects1:objects){
-                PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord();
-
-                pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString()));
-                pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1]));
-                pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2]));
-                pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3]));
-                pgAssetInSpectionRecord.setState(String.valueOf(objects1[4]));
-                pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5]));
-                pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6]));
-                pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7]));
-                pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8]));
-                pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9]));
-                pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10]));
-                pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11]));
-                pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12]));
-                pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13]));
-                pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14]));
-                pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15]));
-                pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16]));
-                pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17]));
-                pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18]));
-                pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19]));
-
-                pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord);
-            }
-
-            List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-            for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList)
-            {
-                pgAssetInSpectionRecordDtoList.add(PgAssetInSpectionRecordDto.ConvertToDto(pgAssetInSpectionRecord));
-            }
-
-            return pgAssetInSpectionRecordDtoList;
-        }
-        catch(Exception e)
-        {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public List<PgAssetInSpectionRecordStatic> getPgAssetInSpectionRecordStaticLisByTime(
-            String startTime, String endTime, String staticType) {
-
-        String sql="";
-        String dateType="";
-        List<PgAssetInSpectionRecordStatic> pgAssetInSpectionRecordStaticList=new ArrayList<>();
-        int type=Integer.valueOf(staticType);
-
-        switch(type) {
-            case 0://年
-                dateType = "yyyy";
-                break;
-            case 1://月
-                dateType = "yyyy-mm";
-                break;
-            case 2://周
-                dateType = "iw";
-                break;
-            case 3://日
-                dateType="yyyy-mm-dd";
-                break;
-            default:
-                break;
-        }
-
-        sql="select count(*), to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_RECORD t where 1=1";
-
-        if(startTime!=null)
-            sql+=" and t.CREATE_DATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
-        if(endTime!=null)
-            sql+=" and t.CREATE_DATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
-
-        sql+=" group by to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"')";
-
-        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
-        for(int i=0;i<objects.size();i++)
-        {
-            PgAssetInSpectionRecordStatic pgAssetInSpectionRecordStatic=new PgAssetInSpectionRecordStatic();
-            pgAssetInSpectionRecordStatic.setNum(objects.get(i)[0].toString());
-            pgAssetInSpectionRecordStatic.setCreateDate(objects.get(i)[1].toString());
-            pgAssetInSpectionRecordStaticList.add(pgAssetInSpectionRecordStatic);
-        }
-        return pgAssetInSpectionRecordStaticList;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
new file mode 100644
index 0000000..bb6bf1e
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
@@ -0,0 +1,81 @@
+package com.casic.PgInterface.maintenance.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgAssetPlanManager extends HibernateEntityDao<PgAssetPlan> {
+
+    public List<PgAssetPlanDto> getPgAssetPlanDtoList(String inSpectionPlace){
+        Criteria criteria=createCriteria(PgAssetPlan.class);
+
+        if(StringUtils.isNotBlank(inSpectionPlace))
+            criteria.add(Restrictions.like("INSPECTION_PRACE","%"+inSpectionPlace+"%"));
+        criteria.addOrder(Order.desc("id"));
+
+        List<PgAssetPlan> pgAssetPlanList=criteria.list();
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=PgAssetPlanDto.ConvertToPgAssetDtoList(pgAssetPlanList);
+
+        if(pgAssetPlanDtoList==null||pgAssetPlanDtoList.size()==0)
+            return null;
+        else
+            return pgAssetPlanDtoList;
+    }
+
+    public List<PgAssetPlanStatic> getPgAssetPlanStaticLisByTime(
+            String startTime, String endTime, String staticType) {
+
+        String sql="";
+        String dateType="";
+        List<PgAssetPlanStatic> pgAssetPlanStaticList=new ArrayList<>();
+        int type=Integer.valueOf(staticType);
+
+        switch(type) {
+            case 0://年
+                dateType = "yyyy";
+                break;
+            case 1://月
+                dateType = "yyyy-mm";
+                break;
+            case 2://周
+                dateType = "iw";
+                break;
+            case 3://日
+                dateType="yyyy-mm-dd";
+                break;
+            default:
+                break;
+        }
+
+        sql="select count(*), to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_PLAN t where 1=1";
+
+        if(startTime!=null)
+            sql+=" and t.CREATEDATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
+        if(endTime!=null)
+            sql+=" and t.CREATEDATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
+
+        sql+=" group by to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"')";
+
+        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
+        for(int i=0;i<objects.size();i++)
+        {
+            PgAssetPlanStatic pgAssetPlanStatic=new PgAssetPlanStatic();
+            pgAssetPlanStatic.setNum(objects.get(i)[0].toString());
+            pgAssetPlanStatic.setCreateDate(objects.get(i)[1].toString());
+            pgAssetPlanStaticList.add(pgAssetPlanStatic);
+        }
+        return pgAssetPlanStaticList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 0903f22..3484739 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -15,7 +15,7 @@
 
     public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
             if(repairMan!=null)
                 sql+=" and REPAIRMAN like '%"+repairMan+"%'";

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ff69e2a..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,27 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190828.docx" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -32,72 +42,119 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="2" />
-          <entry key="java" value="243" />
-          <entry key="properties" value="6" />
+          <entry key="java" value="321" />
+          <entry key="properties" value="8" />
           <entry key="xml" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
-          <entry key="JAVA" value="243" />
-          <entry key="Properties" value="6" />
+          <entry key="JAVA" value="321" />
+          <entry key="Properties" value="8" />
           <entry key="XML" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="8082" />
-          <entry key="properties" value="49" />
-          <entry key="txt" value="64" />
+          <entry key="dummy" value="16" />
+          <entry key="java" value="10723" />
+          <entry key="properties" value="59" />
+          <entry key="txt" value="118" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="8082" />
-          <entry key="PLAIN_TEXT" value="64" />
-          <entry key="Properties" value="49" />
+          <entry key="JAVA" value="10723" />
+          <entry key="PLAIN_TEXT" value="134" />
+          <entry key="Properties" value="59" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="4" />
+          <entry key="project.closed" value="28" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
           <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.24" value="1" />
+          <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="1" />
-          <entry key="project.open.time.3" value="3" />
-          <entry key="project.open.time.31" value="1" />
+          <entry key="project.open.time.28" value="1" />
+          <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.31" value="2" />
           <entry key="project.open.time.37" value="1" />
+          <entry key="project.open.time.39" value="2" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.40" value="1" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="1" />
+          <entry key="project.open.time.44" value="2" />
           <entry key="project.open.time.45" value="2" />
           <entry key="project.open.time.48" value="1" />
           <entry key="project.open.time.49" value="1" />
+          <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.58" value="1" />
           <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.71" value="1" />
+          <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.71" value="2" />
           <entry key="project.open.time.76" value="1" />
-          <entry key="project.opened" value="25" />
+          <entry key="project.opened" value="41" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+            <state relative-caret-position="174">
+              <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
               <folding>
-                <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-                <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="352">
+              <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#787#788#0" expanded="true" />
+                <element signature="e#817#818#0" expanded="true" />
+                <element signature="e#2105#2106#0" expanded="true" />
+                <element signature="e#2135#2136#0" expanded="true" />
+                <element signature="e#2431#2432#0" expanded="true" />
+                <element signature="e#2461#2462#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="638">
+              <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+              <folding>
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -122,6 +179,7 @@
       <find>getPgDeviceByDevType</find>
       <find>message</find>
       <find>getConstructionByType</find>
+      <find>getPgCameraListByPosition</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -130,24 +188,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanTypeDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
@@ -162,17 +207,38 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
       </list>
     </option>
   </component>
@@ -208,16 +274,18 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="3" />
-    <option name="y" value="10" />
-    <option name="width" value="1386" />
-    <option name="height" value="788" />
+    <option name="x" value="1410" />
+    <option name="y" value="117" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -258,7 +326,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -267,16 +335,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -286,7 +345,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="dto" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -296,7 +355,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="manager" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -308,19 +367,10 @@
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="webapp" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -359,6 +409,7 @@
       </deployment>
       <server-settings>
         <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_7" />
+        <option name="JNDI_PORT" value="10991" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -456,7 +507,23 @@
       <workItem from="1566350810712" duration="6803000" />
       <workItem from="1566435787074" duration="10717000" />
       <workItem from="1566521753529" duration="14265000" />
-      <workItem from="1566614176989" duration="5693000" />
+      <workItem from="1566614176989" duration="14059000" />
+      <workItem from="1566780822009" duration="1026000" />
+      <workItem from="1566891563975" duration="284000" />
+      <workItem from="1566893107340" duration="3382000" />
+      <workItem from="1566953794976" duration="11039000" />
+      <workItem from="1567059357700" duration="484000" />
+      <workItem from="1567082835097" duration="1086000" />
+      <workItem from="1567126428020" duration="1539000" />
+      <workItem from="1567129277820" duration="5788000" />
+      <workItem from="1567136008996" duration="2568000" />
+      <workItem from="1567237040302" duration="111000" />
+      <workItem from="1567495626345" duration="2797000" />
+      <workItem from="1567558770152" duration="2352000" />
+      <workItem from="1567577368149" duration="640000" />
+      <workItem from="1567751224608" duration="780000" />
+      <workItem from="1568019299799" duration="695000" />
+      <workItem from="1568082566133" duration="4016000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -493,17 +560,60 @@
       <option name="project" value="LOCAL" />
       <updated>1566553388171</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="整理管线部分">
+      <created>1566620046627</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1566620046627</updated>
+    </task>
+    <task id="LOCAL-00007" summary="合并代码提交">
+      <created>1566781001910</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1566781001910</updated>
+    </task>
+    <task id="LOCAL-00008" summary="合并代码提交">
+      <created>1566963831930</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1566963831930</updated>
+    </task>
+    <task id="LOCAL-00009" summary="修改报警阈值">
+      <created>1566972146710</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1566972146710</updated>
+    </task>
+    <task id="LOCAL-00010" summary="修改巡检维护表字段">
+      <created>1567126525554</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1567126525554</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="142930000" />
+    <option name="totallyTimeSpent" value="189883000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
+    <frame x="1358" y="-8" width="1456" height="916" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29297996" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -511,13 +621,14 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Thumbnails" weight="0.3295082" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.5081967" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.3849105" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
       <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
       <window_info anchor="bottom" id="Spring" order="8" />
       <window_info anchor="bottom" id="Terminal" order="9" />
@@ -539,7 +650,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2193646" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -547,22 +658,23 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.47540984" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
-      <window_info anchor="bottom" id="Spring" order="8" />
-      <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
-      <window_info anchor="bottom" id="Statistic" order="11" />
-      <window_info anchor="bottom" id="Java Enterprise" order="12" />
-      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="14" weight="0.32786885" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.52307695" />
+      <window_info anchor="bottom" id="Thumbnails" order="0" weight="0.3295082" />
+      <window_info anchor="bottom" id="Message" order="1" />
+      <window_info anchor="bottom" id="Find" order="2" />
+      <window_info anchor="bottom" id="Run" order="3" />
+      <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.49924356" weight="0.49344262" />
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Application Servers" order="8" weight="0.3276923" />
+      <window_info anchor="bottom" id="Spring" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
+      <window_info anchor="bottom" id="Statistic" order="12" />
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <window_info anchor="bottom" id="Database Changes" order="14" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="15" weight="0.32786885" />
+      <window_info anchor="bottom" id="Messages" order="16" weight="0.5229508" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -578,6 +690,16 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -587,7 +709,11 @@
     <MESSAGE value="修改权限问题" />
     <MESSAGE value="修改人员登录返回接口" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整理管线部分" />
+    <MESSAGE value="合并代码提交" />
+    <MESSAGE value="修改报警阈值" />
+    <MESSAGE value="修改巡检维护表字段" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护表字段" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -602,322 +728,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-532">
-          <caret line="50" column="28" lean-forward="true" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="19" column="60" selection-start-line="19" selection-start-column="60" selection-end-line="19" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="100" column="34" lean-forward="true" selection-start-line="100" selection-start-column="34" selection-end-line="100" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1474">
-          <caret line="84" column="58" selection-start-line="84" selection-start-column="58" selection-end-line="84" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1100">
-          <caret line="58" column="18" selection-start-line="58" selection-start-column="18" selection-end-line="58" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6842">
-          <caret line="329" selection-start-line="329" selection-end-line="329" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="102" column="24" lean-forward="true" selection-start-line="102" selection-start-column="24" selection-end-line="102" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="72" column="56" lean-forward="true" selection-start-line="72" selection-start-column="56" selection-end-line="72" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="90" column="39" lean-forward="true" selection-start-line="90" selection-start-column="39" selection-end-line="90" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="97" column="16" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
-          <caret line="14" column="52" lean-forward="true" selection-start-line="14" selection-start-column="52" selection-end-line="14" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="26" column="34" lean-forward="true" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="61" column="1" lean-forward="true" selection-start-line="61" selection-start-column="1" selection-end-line="61" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="208" column="49" lean-forward="true" selection-start-line="208" selection-start-column="49" selection-end-line="208" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="140" column="57" selection-start-line="140" selection-start-column="57" selection-end-line="140" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="111" column="36" selection-start-line="111" selection-start-column="36" selection-end-line="111" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="3" lean-forward="true" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="81" column="58" lean-forward="true" selection-start-line="81" selection-start-column="58" selection-end-line="81" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="472">
-          <caret line="118" column="59" selection-start-line="118" selection-start-column="59" selection-end-line="118" selection-end-column="59" />
-          <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-198">
-          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="69" column="32" lean-forward="true" selection-start-line="69" selection-start-column="32" selection-end-line="70" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="142" column="59" lean-forward="true" selection-start-line="142" selection-start-column="59" selection-end-line="142" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="349" column="9" lean-forward="true" selection-start-line="349" selection-start-column="9" selection-end-line="349" selection-end-column="9" />
-          <folding>
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="e#12105#12121#0" expanded="true" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-686">
-          <caret line="67" column="31" lean-forward="true" selection-start-line="67" selection-start-column="31" selection-end-line="67" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="93" column="24" lean-forward="true" selection-start-line="93" selection-start-column="24" selection-end-line="93" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="57" column="23" lean-forward="true" selection-start-line="57" selection-start-column="23" selection-end-line="57" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-408">
-          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="98" column="40" lean-forward="true" selection-start-line="98" selection-start-column="40" selection-end-line="98" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="572">
@@ -925,13 +735,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="328" column="32" lean-forward="true" selection-start-line="328" selection-start-column="32" selection-end-line="328" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
@@ -950,16 +753,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="396">
           <caret line="23" column="32" lean-forward="true" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
-          <folding>
-            <element signature="e#2635#2636#0" expanded="true" />
-            <element signature="e#2671#2672#0" expanded="true" />
-            <element signature="e#2727#2728#0" expanded="true" />
-            <element signature="e#2777#2778#0" expanded="true" />
-            <element signature="e#2877#2878#0" expanded="true" />
-            <element signature="e#2911#2912#0" expanded="true" />
-            <element signature="e#2963#2964#0" expanded="true" />
-            <element signature="e#3009#3010#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -972,14 +765,481 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+        <state relative-caret-position="66">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="59" column="46" lean-forward="true" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3586">
+          <caret line="179" column="16" selection-start-line="179" selection-start-column="16" selection-end-line="179" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5478">
+          <caret line="273" column="3" selection-start-line="273" selection-start-column="3" selection-end-line="273" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1870">
+          <caret line="147" column="11" selection-start-line="147" selection-start-column="11" selection-end-line="147" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="55" column="15" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="106">
+          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="290" column="41" lean-forward="true" selection-start-line="290" selection-start-column="41" selection-end-line="290" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="21" column="32" lean-forward="true" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="550">
+          <caret line="38" column="89" selection-start-line="38" selection-start-column="89" selection-end-line="38" selection-end-column="89" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="11" column="28" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1166">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="818">
+          <caret line="285" column="13" lean-forward="true" selection-start-line="285" selection-start-column="13" selection-end-line="285" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="129" column="31" lean-forward="true" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="323" column="72" lean-forward="true" selection-start-line="323" selection-start-column="72" selection-end-line="323" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="44" column="13" lean-forward="true" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-638">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="244">
+          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="157">
+          <caret line="16" column="55" lean-forward="true" selection-start-line="16" selection-start-column="55" selection-end-line="16" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="270" column="33" lean-forward="true" selection-start-line="270" selection-start-column="33" selection-end-line="270" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="490">
+          <caret line="141" selection-start-line="141" selection-end-line="141" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="164" column="5" lean-forward="true" selection-start-line="164" selection-start-column="5" selection-end-line="164" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/apiTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-242">
+          <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="61" column="16" lean-forward="true" selection-start-line="61" selection-start-column="16" selection-end-line="61" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="700">
+          <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="12" column="34" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="39" column="9" lean-forward="true" selection-start-line="39" selection-start-column="9" selection-end-line="39" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="32" column="29" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="29" />
           <folding>
-            <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-            <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#1838#1839#0" expanded="true" />
+            <element signature="e#1863#1864#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1925#1926#0" expanded="true" />
+            <element signature="e#1822#1823#0" expanded="true" />
+            <element signature="e#1851#1852#0" expanded="true" />
+            <element signature="e#1895#1896#0" expanded="true" />
+            <element signature="e#1931#1932#0" expanded="true" />
+            <element signature="e#2132#2133#0" expanded="true" />
+            <element signature="e#2164#2165#0" expanded="true" />
+            <element signature="e#2214#2215#0" expanded="true" />
+            <element signature="e#2256#2257#0" expanded="true" />
+            <element signature="e#2330#2331#0" expanded="true" />
+            <element signature="e#2370#2371#0" expanded="true" />
+            <element signature="e#2436#2437#0" expanded="true" />
+            <element signature="e#2494#2495#0" expanded="true" />
+            <element signature="e#2569#2570#0" expanded="true" />
+            <element signature="e#2602#2603#0" expanded="true" />
+            <element signature="e#2654#2655#0" expanded="true" />
+            <element signature="e#2698#2699#0" expanded="true" />
+            <element signature="e#2764#2765#0" expanded="true" />
+            <element signature="e#2795#2796#0" expanded="true" />
+            <element signature="e#2843#2844#0" expanded="true" />
+            <element signature="e#2883#2884#0" expanded="true" />
+            <element signature="e#2948#2949#0" expanded="true" />
+            <element signature="e#2980#2981#0" expanded="true" />
+            <element signature="e#3030#3031#0" expanded="true" />
+            <element signature="e#3072#3073#0" expanded="true" />
+            <element signature="e#3134#3135#0" expanded="true" />
+            <element signature="e#3162#3163#0" expanded="true" />
+            <element signature="e#3204#3205#0" expanded="true" />
+            <element signature="e#3238#3239#0" expanded="true" />
+            <element signature="e#3307#3308#0" expanded="true" />
+            <element signature="e#3346#3347#0" expanded="true" />
+            <element signature="e#3410#3411#0" expanded="true" />
+            <element signature="e#3466#3467#0" expanded="true" />
+            <element signature="e#3537#3538#0" expanded="true" />
+            <element signature="e#3567#3568#0" expanded="true" />
+            <element signature="e#3613#3614#0" expanded="true" />
+            <element signature="e#3651#3652#0" expanded="true" />
+            <element signature="e#3721#3722#0" expanded="true" />
+            <element signature="e#3759#3760#0" expanded="true" />
+            <element signature="e#3821#3822#0" expanded="true" />
+            <element signature="e#3875#3876#0" expanded="true" />
+            <element signature="e#3953#3954#0" expanded="true" />
+            <element signature="e#3991#3992#0" expanded="true" />
+            <element signature="e#4053#4054#0" expanded="true" />
+            <element signature="e#4107#4108#0" expanded="true" />
+            <element signature="e#4186#4187#0" expanded="true" />
+            <element signature="e#4225#4226#0" expanded="true" />
+            <element signature="e#4289#4290#0" expanded="true" />
+            <element signature="e#4345#4346#0" expanded="true" />
+            <element signature="e#4430#4431#0" expanded="true" />
+            <element signature="e#4474#4475#0" expanded="true" />
+            <element signature="e#4698#4699#0" expanded="true" />
+            <element signature="e#4740#4741#0" expanded="true" />
+            <element signature="e#4810#4811#0" expanded="true" />
+            <element signature="e#4872#4873#0" expanded="true" />
+            <element signature="e#4955#4956#0" expanded="true" />
+            <element signature="e#4994#4995#0" expanded="true" />
+            <element signature="e#5058#5059#0" expanded="true" />
+            <element signature="e#5114#5115#0" expanded="true" />
+            <element signature="e#5194#5195#0" expanded="true" />
+            <element signature="e#5233#5234#0" expanded="true" />
+            <element signature="e#5297#5298#0" expanded="true" />
+            <element signature="e#5353#5354#0" expanded="true" />
+            <element signature="e#5428#5429#0" expanded="true" />
+            <element signature="e#5462#5463#0" expanded="true" />
+            <element signature="e#5516#5517#0" expanded="true" />
+            <element signature="e#5562#5563#0" expanded="true" />
+            <element signature="e#5634#5635#0" expanded="true" />
+            <element signature="e#5670#5671#0" expanded="true" />
+            <element signature="e#5728#5729#0" expanded="true" />
+            <element signature="e#5778#5779#0" expanded="true" />
+            <element signature="e#5852#5853#0" expanded="true" />
+            <element signature="e#5888#5889#0" expanded="true" />
+            <element signature="e#5946#5947#0" expanded="true" />
+            <element signature="e#5996#5997#0" expanded="true" />
+            <element signature="e#6067#6068#0" expanded="true" />
+            <element signature="e#6100#6101#0" expanded="true" />
+            <element signature="e#6152#6153#0" expanded="true" />
+            <element signature="e#6196#6197#0" expanded="true" />
+            <element signature="e#6261#6262#0" expanded="true" />
+            <element signature="e#6291#6292#0" expanded="true" />
+            <element signature="e#6337#6338#0" expanded="true" />
+            <element signature="e#6375#6376#0" expanded="true" />
+            <element signature="e#6437#6438#0" expanded="true" />
+            <element signature="e#6467#6468#0" expanded="true" />
+            <element signature="e#6513#6514#0" expanded="true" />
+            <element signature="e#6551#6552#0" expanded="true" />
+            <element signature="e#6613#6614#0" expanded="true" />
+            <element signature="e#6643#6644#0" expanded="true" />
+            <element signature="e#6689#6690#0" expanded="true" />
+            <element signature="e#6727#6728#0" expanded="true" />
+            <element signature="e#6796#6797#0" expanded="true" />
+            <element signature="e#6829#6830#0" expanded="true" />
+            <element signature="e#6881#6882#0" expanded="true" />
+            <element signature="e#6925#6926#0" expanded="true" />
+            <element signature="e#6995#6996#0" expanded="true" />
+            <element signature="e#7030#7031#0" expanded="true" />
+            <element signature="e#7086#7087#0" expanded="true" />
+            <element signature="e#7134#7135#0" expanded="true" />
+            <element signature="e#7202#7203#0" expanded="true" />
+            <element signature="e#7233#7234#0" expanded="true" />
+            <element signature="e#7281#7282#0" expanded="true" />
+            <element signature="e#7321#7322#0" expanded="true" />
+            <element signature="e#7390#7391#0" expanded="true" />
+            <element signature="e#7426#7427#0" expanded="true" />
+            <element signature="e#7484#7485#0" expanded="true" />
+            <element signature="e#7534#7535#0" expanded="true" />
+            <element signature="e#7602#7603#0" expanded="true" />
+            <element signature="e#7636#7637#0" expanded="true" />
+            <element signature="e#7690#7691#0" expanded="true" />
+            <element signature="e#7736#7737#0" expanded="true" />
+            <element signature="e#7806#7807#0" expanded="true" />
+            <element signature="e#7840#7841#0" expanded="true" />
+            <element signature="e#7894#7895#0" expanded="true" />
+            <element signature="e#7940#7941#0" expanded="true" />
+            <element signature="e#8006#8007#0" expanded="true" />
+            <element signature="e#8036#8037#0" expanded="true" />
+            <element signature="e#8082#8083#0" expanded="true" />
+            <element signature="e#8120#8121#0" expanded="true" />
+            <element signature="e#8189#8190#0" expanded="true" />
+            <element signature="e#8226#8227#0" expanded="true" />
+            <element signature="e#8286#8287#0" expanded="true" />
+            <element signature="e#8338#8339#0" expanded="true" />
+            <element signature="e#8417#8418#0" expanded="true" />
+            <element signature="e#8457#8458#0" expanded="true" />
+            <element signature="e#8523#8524#0" expanded="true" />
+            <element signature="e#8581#8582#0" expanded="true" />
+            <element signature="e#8655#8656#0" expanded="true" />
+            <element signature="e#8687#8688#0" expanded="true" />
+            <element signature="e#8737#8738#0" expanded="true" />
+            <element signature="e#8779#8780#0" expanded="true" />
+            <element signature="e#8846#8847#0" expanded="true" />
+            <element signature="e#8879#8880#0" expanded="true" />
+            <element signature="e#8931#8932#0" expanded="true" />
+            <element signature="e#8975#8976#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#787#788#0" expanded="true" />
+            <element signature="e#817#818#0" expanded="true" />
+            <element signature="e#2105#2106#0" expanded="true" />
+            <element signature="e#2135#2136#0" expanded="true" />
+            <element signature="e#2431#2432#0" expanded="true" />
+            <element signature="e#2461#2462#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index 854f1f1..0db633a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -165,12 +165,16 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String startDay,String endDay) {
+    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew) {
         try {
 
             Criteria criteria = createCriteria(PgAlarm.class);
             criteria.addOrder(Order.desc("id"));
 
+            if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) {
+                criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
+            }
+
             if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay))
             {
                 criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay)));
@@ -193,9 +197,11 @@
 
                 criteria.add(Restrictions.le("alarmDate",date));
             }
+            if(StringUtils.isNotBlank(isNew)&&isNew.equals("true"))
+                criteria.add(Restrictions.eq("active", 1));
 
             List<PgAlarm> pgAlarmList = criteria.list();
-            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
     }
 
     //根据设备位置(仓位)获取摄像机列表
-    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+    public List<PgDeviceDto> getPgCameraListByPosition(String partition,String position){
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.like("position",position+"%"));
-//        criteria.add(Restrictions.eq("devType","球机"));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(position))
+            criteria.add(Restrictions.like("position",position+"%"));
+
         criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
 
         List<PgDevice> pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
             dto.setDevCode(objects[5].toString());
             dto.setDevType(objects[6].toString());
             if(objects[7]!=null)
-            dto.setIp(objects[7].toString());
+                dto.setIp(objects[7].toString());
             dto.setIsOpen(objects[8].toString());
             dto.setPartition(objects[11].toString());
             dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index 8ebf74d..3c657a7 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgEquipment;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
 import com.casic.PgInterface.devTable.dto.PgEquipmentDto;
@@ -34,9 +35,12 @@
     public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
-        criteria.add(Restrictions.eq("eqName",eqName));
-        criteria.add(Restrictions.eq("eqCode",eqCode));
-        criteria.add(Restrictions.eq("eqType",eqType));
+        if(StringUtils.isNotBlank(eqName))
+            criteria.add(Restrictions.eq("eqName",eqName));
+        if(StringUtils.isNotBlank(eqCode))
+            criteria.add(Restrictions.eq("eqCode",eqCode));
+        if(StringUtils.isNotBlank(eqType))
+            criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
@@ -51,10 +55,9 @@
 
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
-        //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
         String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
-        +eqType+"' group by equipment.EQ_NAME";
+                +eqType+"' group by equipment.EQ_NAME";
 
         List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4ed68e4..e413a5c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
@@ -39,7 +40,8 @@
 
     public List<PgPipeLineDto> getPipeLineByLineType(String lineType) {
         Criteria criteria = createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineType", lineType));
+        if(StringUtils.isNotBlank(lineType))
+            criteria.add(Restrictions.eq("lineType", lineType));
 
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    private Long id;
-    private String keyId;//巡检记录单id
-    private String planId;//巡检计划ID
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    @Column(name="KEY_ID")
-    public String getKeyId() {
-        return keyId;
-    }
-
-    public void setKeyId(String keyId) {
-        this.keyId = keyId;
-    }
-
-    @Column(name="PLAN_ID")
-    public String getPlanId() {
-        return planId;
-    }
-
-    public void setPlanId(String planId) {
-        this.planId = planId;
-    }
-
-    @Column(name="CREATE_DATE")
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    @Column(name="STATE")
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    @Column(name="CREATOR")
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    @Column(name="PLAN_NAME")
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    @Column(name="RECORD_NO")
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    @Column(name="PLAN_NO")
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    @Column(name="RESPONSIBIE_DEPT")
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    @Column(name="INSPECTION_PERSON")
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    @Column(name="PATROL_MAN")
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    @Column(name="OPERATE_DATE")
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    @Column(name="REMARK")
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Column(name="BUILD_CABIN")
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    @Column(name="PROJECT")
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    @Column(name="START_PILE_NO")
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    @Column(name="END_PILE_NO")
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    @Column(name="INSPECTION_PRACE")
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    @Column(name="OTHER_PATROL_MAN")
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private Long id;
+    private String KEY_ID;//唯一键值
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_PERSON;//巡检人
+    private String START_DATE;//巡检开始时间
+    private String END_DATE;
+    private String FREQUENCY;//巡检频率
+    private String STATE;//状态
+    private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+    private String PLAN_NO;//巡检计划编号
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_MODE;//巡检方式
+    private String INSPECTION_ROUTE;//巡检路线
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String INSPECTION_GROUP;//巡检部门
+    private String INSERT_TIME;//插入时间
+    private String FREQUENCYDATE;//巡检具体日期
+    private String FREQUENCYTIME;//巡检具体时间
+    private String CREATEDATE;//创建时间
+    private String CREATOR;//创建人
+    private String PROJECT;//项目
+    private String COMLILE;//编制人
+    private String START_TIME;//编制时间
+    private String DEVELOP_DEPT;//制定部门
+    private String END_TIME;//结束时间
+    private String START_PILE_NO;//开始桩号
+    private String END_PILE_NO;//结束桩号
+    private String BUILD_CABIN;//巡检舱室
+    private String MILEAGE;
+    private String FREQUENCY_TIME;//巡检具体时间
+    private String FREQUENCYTIME_END;
+    private String KETTLE_TS;
+    private String UPDATEDATE;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="KEY_ID")
+    public String getKEY_ID() {
+        return KEY_ID;
+    }
+
+    public void setKEY_ID(String KEY_ID) {
+        this.KEY_ID = KEY_ID;
+    }
+
+    @Column(name="PLAN_NAME")
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    @Column(name="INSPECTION_PERSON")
+    public String getINSPECTION_PERSON() {
+        return INSPECTION_PERSON;
+    }
+
+    public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+        this.INSPECTION_PERSON = INSPECTION_PERSON;
+    }
+
+    @Column(name="START_DATE")
+    public String getSTART_DATE() {
+        return START_DATE;
+    }
+
+    public void setSTART_DATE(String START_DATE) {
+        this.START_DATE = START_DATE;
+    }
+
+    @Column(name="END_DATE")
+    public String getEND_DATE() {
+        return END_DATE;
+    }
+
+    public void setEND_DATE(String END_DATE) {
+        this.END_DATE = END_DATE;
+    }
+
+    @Column(name="FREQUENCY")
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    @Column(name="STATE")
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    @Column(name="RESPONSIBLE_DEPT")
+    public String getRESPONSIBLE_DEPT() {
+        return RESPONSIBLE_DEPT;
+    }
+
+    public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+        this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+    }
+
+    @Column(name="PLAN_NO")
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    @Column(name="INSPECTION_TYPE")
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    @Column(name="INSPECTION_MODE")
+    public String getINSPECTION_MODE() {
+        return INSPECTION_MODE;
+    }
+
+    public void setINSPECTION_MODE(String INSPECTION_MODE) {
+        this.INSPECTION_MODE = INSPECTION_MODE;
+    }
+
+    @Column(name="INSPECTION_ROUTE")
+    public String getINSPECTION_ROUTE() {
+        return INSPECTION_ROUTE;
+    }
+
+    public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+        this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+    }
+
+    @Column(name="INSPECTION_START_TIME")
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    @Column(name="INSPECTION_END_TIME")
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    @Column(name="INSPECTION_PRACE")
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    @Column(name="INSPECTION_GROUP")
+    public String getINSPECTION_GROUP() {
+        return INSPECTION_GROUP;
+    }
+
+    public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+        this.INSPECTION_GROUP = INSPECTION_GROUP;
+    }
+
+    @Column(name="INSERT_TIME")
+    public String getINSERT_TIME() {
+        return INSERT_TIME;
+    }
+
+    public void setINSERT_TIME(String INSERT_TIME) {
+        this.INSERT_TIME = INSERT_TIME;
+    }
+
+    @Column(name="FREQUENCYDATE")
+    public String getFREQUENCYDATE() {
+        return FREQUENCYDATE;
+    }
+
+    public void setFREQUENCYDATE(String FREQUENCYDATE) {
+        this.FREQUENCYDATE = FREQUENCYDATE;
+    }
+
+    @Column(name="FREQUENCYTIME")
+    public String getFREQUENCYTIME() {
+        return FREQUENCYTIME;
+    }
+
+    public void setFREQUENCYTIME(String FREQUENCYTIME) {
+        this.FREQUENCYTIME = FREQUENCYTIME;
+    }
+
+    @Column(name="CREATEDATE")
+    public String getCREATEDATE() {
+        return CREATEDATE;
+    }
+
+    public void setCREATEDATE(String CREATEDATE) {
+        this.CREATEDATE = CREATEDATE;
+    }
+
+    @Column(name="CREATOR")
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    @Column(name="PROJECT")
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    @Column(name="COMLILE")
+    public String getCOMLILE() {
+        return COMLILE;
+    }
+
+    public void setCOMLILE(String COMLILE) {
+        this.COMLILE = COMLILE;
+    }
+
+    @Column(name="START_TIME")
+    public String getSTART_TIME() {
+        return START_TIME;
+    }
+
+    public void setSTART_TIME(String START_TIME) {
+        this.START_TIME = START_TIME;
+    }
+
+    @Column(name="DEVELOP_DEPT")
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    @Column(name="END_TIME")
+    public String getEND_TIME() {
+        return END_TIME;
+    }
+
+    public void setEND_TIME(String END_TIME) {
+        this.END_TIME = END_TIME;
+    }
+
+    @Column(name="START_PILE_NO")
+    public String getSTART_PILE_NO() {
+        return START_PILE_NO;
+    }
+
+    public void setSTART_PILE_NO(String START_PILE_NO) {
+        this.START_PILE_NO = START_PILE_NO;
+    }
+
+    @Column(name="END_PILE_NO")
+    public String getEND_PILE_NO() {
+        return END_PILE_NO;
+    }
+
+    public void setEND_PILE_NO(String END_PILE_NO) {
+        this.END_PILE_NO = END_PILE_NO;
+    }
+
+    @Column(name="BUILD_CABIN")
+    public String getBUILD_CABIN() {
+        return BUILD_CABIN;
+    }
+
+    public void setBUILD_CABIN(String BUILD_CABIN) {
+        this.BUILD_CABIN = BUILD_CABIN;
+    }
+
+    @Column(name="MILEAGE")
+    public String getMILEAGE() {
+        return MILEAGE;
+    }
+
+    public void setMILEAGE(String MILEAGE) {
+        this.MILEAGE = MILEAGE;
+    }
+
+    @Column(name="FREQUENCY_TIME")
+    public String getFREQUENCY_TIME() {
+        return FREQUENCY_TIME;
+    }
+
+    public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+        this.FREQUENCY_TIME = FREQUENCY_TIME;
+    }
+
+    @Column(name="FREQUENCYTIME_END")
+    public String getFREQUENCYTIME_END() {
+        return FREQUENCYTIME_END;
+    }
+
+    public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+        this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+    }
+
+    @Column(name="KETTLE_TS")
+    public String getKETTLE_TS() {
+        return KETTLE_TS;
+    }
+
+    public void setKETTLE_TS(String KETTLE_TS) {
+        this.KETTLE_TS = KETTLE_TS;
+    }
+
+    @Column(name="UPDATEDATE")
+    public String getUPDATEDATE() {
+        return UPDATEDATE;
+    }
+
+    public void setUPDATEDATE(String UPDATEDATE) {
+        this.UPDATEDATE = UPDATEDATE;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 5346b57..2f8d359 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -66,7 +66,7 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REPAIRMAN")
+    @Column(name="REOAIRMAN")
     public String getRepairMan() {
         return repairMan;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
-    private Long id;
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-
-
-    public static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
-        PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
-        pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
-        pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
-        pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
-        pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
-        pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
-        pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
-        pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
-        pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
-        pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
-        pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
-        pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
-        pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
-        pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
-        pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
-        return pgAssetInSpectionRecordDto;
-    }
-
-
-    public static List<PgAssetInSpectionRecordDto> ConvertToDtoList(List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList){
-        List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-        for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
-            pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
-        }
-
-        return pgAssetInSpectionRecordDtoList;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
-    private String num;
-    private String createDate;
-
-    public String getNum() {
-        return num;
-    }
-
-    public void setNum(String num) {
-        this.num = num;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+    private Long id;
+    private String PLAN_NO;//巡检计划编号
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String FREQUENCY;//巡检频率
+    private String CREATOR;//创建人
+    private String DEVELOP_DEPT;//制定部门
+    private String PROJECT;//项目
+    private String STATE;//状态
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+        PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+        pgAssetPlanDto.setId(pgAssetPlan.getId());
+        pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+        pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+        pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+        pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+        pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+        pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+        pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+        pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+        pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+        pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+        pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+        return pgAssetPlanDto;
+    }
+
+    public static List<PgAssetPlanDto> ConvertToPgAssetDtoList(List<PgAssetPlan> pgAssetPlanList){
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
+
+        for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+            pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+        }
+
+        return pgAssetPlanDtoList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
new file mode 100644
index 0000000..bc12db1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
@@ -0,0 +1,24 @@
+package com.casic.PgInterface.maintenance.dto;
+
+public class PgAssetPlanStatic {
+
+    private String num;
+    private String createDate;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
deleted file mode 100644
index c41ca7d..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.casic.PgInterface.maintenance.manager;
-
-import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
-
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
-        try {
-            String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
-                    "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
-                    "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-
-            if(patrolMan!=null)
-                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
-            if(startTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
-            if(endTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')<to_date('"+endTime+"','yyyy-MM-dd')";
-
-            sql+=" order by id";
-
-            List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
-
-            List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList=new ArrayList<>();
-            for(Object[] objects1:objects){
-                PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord();
-
-                pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString()));
-                pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1]));
-                pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2]));
-                pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3]));
-                pgAssetInSpectionRecord.setState(String.valueOf(objects1[4]));
-                pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5]));
-                pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6]));
-                pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7]));
-                pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8]));
-                pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9]));
-                pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10]));
-                pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11]));
-                pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12]));
-                pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13]));
-                pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14]));
-                pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15]));
-                pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16]));
-                pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17]));
-                pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18]));
-                pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19]));
-
-                pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord);
-            }
-
-            List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-            for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList)
-            {
-                pgAssetInSpectionRecordDtoList.add(PgAssetInSpectionRecordDto.ConvertToDto(pgAssetInSpectionRecord));
-            }
-
-            return pgAssetInSpectionRecordDtoList;
-        }
-        catch(Exception e)
-        {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public List<PgAssetInSpectionRecordStatic> getPgAssetInSpectionRecordStaticLisByTime(
-            String startTime, String endTime, String staticType) {
-
-        String sql="";
-        String dateType="";
-        List<PgAssetInSpectionRecordStatic> pgAssetInSpectionRecordStaticList=new ArrayList<>();
-        int type=Integer.valueOf(staticType);
-
-        switch(type) {
-            case 0://年
-                dateType = "yyyy";
-                break;
-            case 1://月
-                dateType = "yyyy-mm";
-                break;
-            case 2://周
-                dateType = "iw";
-                break;
-            case 3://日
-                dateType="yyyy-mm-dd";
-                break;
-            default:
-                break;
-        }
-
-        sql="select count(*), to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_RECORD t where 1=1";
-
-        if(startTime!=null)
-            sql+=" and t.CREATE_DATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
-        if(endTime!=null)
-            sql+=" and t.CREATE_DATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
-
-        sql+=" group by to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"')";
-
-        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
-        for(int i=0;i<objects.size();i++)
-        {
-            PgAssetInSpectionRecordStatic pgAssetInSpectionRecordStatic=new PgAssetInSpectionRecordStatic();
-            pgAssetInSpectionRecordStatic.setNum(objects.get(i)[0].toString());
-            pgAssetInSpectionRecordStatic.setCreateDate(objects.get(i)[1].toString());
-            pgAssetInSpectionRecordStaticList.add(pgAssetInSpectionRecordStatic);
-        }
-        return pgAssetInSpectionRecordStaticList;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
new file mode 100644
index 0000000..bb6bf1e
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
@@ -0,0 +1,81 @@
+package com.casic.PgInterface.maintenance.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgAssetPlanManager extends HibernateEntityDao<PgAssetPlan> {
+
+    public List<PgAssetPlanDto> getPgAssetPlanDtoList(String inSpectionPlace){
+        Criteria criteria=createCriteria(PgAssetPlan.class);
+
+        if(StringUtils.isNotBlank(inSpectionPlace))
+            criteria.add(Restrictions.like("INSPECTION_PRACE","%"+inSpectionPlace+"%"));
+        criteria.addOrder(Order.desc("id"));
+
+        List<PgAssetPlan> pgAssetPlanList=criteria.list();
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=PgAssetPlanDto.ConvertToPgAssetDtoList(pgAssetPlanList);
+
+        if(pgAssetPlanDtoList==null||pgAssetPlanDtoList.size()==0)
+            return null;
+        else
+            return pgAssetPlanDtoList;
+    }
+
+    public List<PgAssetPlanStatic> getPgAssetPlanStaticLisByTime(
+            String startTime, String endTime, String staticType) {
+
+        String sql="";
+        String dateType="";
+        List<PgAssetPlanStatic> pgAssetPlanStaticList=new ArrayList<>();
+        int type=Integer.valueOf(staticType);
+
+        switch(type) {
+            case 0://年
+                dateType = "yyyy";
+                break;
+            case 1://月
+                dateType = "yyyy-mm";
+                break;
+            case 2://周
+                dateType = "iw";
+                break;
+            case 3://日
+                dateType="yyyy-mm-dd";
+                break;
+            default:
+                break;
+        }
+
+        sql="select count(*), to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_PLAN t where 1=1";
+
+        if(startTime!=null)
+            sql+=" and t.CREATEDATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
+        if(endTime!=null)
+            sql+=" and t.CREATEDATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
+
+        sql+=" group by to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"')";
+
+        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
+        for(int i=0;i<objects.size();i++)
+        {
+            PgAssetPlanStatic pgAssetPlanStatic=new PgAssetPlanStatic();
+            pgAssetPlanStatic.setNum(objects.get(i)[0].toString());
+            pgAssetPlanStatic.setCreateDate(objects.get(i)[1].toString());
+            pgAssetPlanStaticList.add(pgAssetPlanStatic);
+        }
+        return pgAssetPlanStaticList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 0903f22..3484739 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -15,7 +15,7 @@
 
     public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
             if(repairMan!=null)
                 sql+=" and REPAIRMAN like '%"+repairMan+"%'";
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index 9cc2881..6d90d7b 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -1,5 +1,7 @@
 package com.casic.PgInterface.patroler.dto;
 
+import com.casic.PgInterface.devTable.domain.PgDevice;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 
 /**
@@ -14,6 +16,7 @@
     private String unit;//单位
     private String alarmType;//报警类型
     private Long pgDeviceId;//设备编号
+    private String assetCode;//资产编号
 
     public Long getId() {
         return id;
@@ -71,7 +74,15 @@
         this.pgDeviceId = pgDeviceId;
     }
 
-    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
+    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule, PgDeviceManager pgDeviceManager) {
         this.setId(pgAlarmRule.getId());
         this.setHighValue(pgAlarmRule.getHighValue());
         this.setLowValue(pgAlarmRule.getLowValue());
@@ -82,6 +93,10 @@
         else
             this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
         this.setPgDeviceId(pgAlarmRule.getPgDeviceId());
+        if(pgAlarmRule.getAlarmTypeId()!=null&&pgDeviceManager.get(pgAlarmRule.getPgDeviceId())!=null)
+            this.setAssetCode(pgDeviceManager.get(pgAlarmRule.getPgDeviceId()).getAssetCode());
+        else
+            this.setAssetCode("");
     }
 
 }
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ff69e2a..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,27 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190828.docx" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -32,72 +42,119 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="2" />
-          <entry key="java" value="243" />
-          <entry key="properties" value="6" />
+          <entry key="java" value="321" />
+          <entry key="properties" value="8" />
           <entry key="xml" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
-          <entry key="JAVA" value="243" />
-          <entry key="Properties" value="6" />
+          <entry key="JAVA" value="321" />
+          <entry key="Properties" value="8" />
           <entry key="XML" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="8082" />
-          <entry key="properties" value="49" />
-          <entry key="txt" value="64" />
+          <entry key="dummy" value="16" />
+          <entry key="java" value="10723" />
+          <entry key="properties" value="59" />
+          <entry key="txt" value="118" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="8082" />
-          <entry key="PLAIN_TEXT" value="64" />
-          <entry key="Properties" value="49" />
+          <entry key="JAVA" value="10723" />
+          <entry key="PLAIN_TEXT" value="134" />
+          <entry key="Properties" value="59" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="4" />
+          <entry key="project.closed" value="28" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
           <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.24" value="1" />
+          <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="1" />
-          <entry key="project.open.time.3" value="3" />
-          <entry key="project.open.time.31" value="1" />
+          <entry key="project.open.time.28" value="1" />
+          <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.31" value="2" />
           <entry key="project.open.time.37" value="1" />
+          <entry key="project.open.time.39" value="2" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.40" value="1" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="1" />
+          <entry key="project.open.time.44" value="2" />
           <entry key="project.open.time.45" value="2" />
           <entry key="project.open.time.48" value="1" />
           <entry key="project.open.time.49" value="1" />
+          <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.58" value="1" />
           <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.71" value="1" />
+          <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.71" value="2" />
           <entry key="project.open.time.76" value="1" />
-          <entry key="project.opened" value="25" />
+          <entry key="project.opened" value="41" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+            <state relative-caret-position="174">
+              <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
               <folding>
-                <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-                <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="352">
+              <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#787#788#0" expanded="true" />
+                <element signature="e#817#818#0" expanded="true" />
+                <element signature="e#2105#2106#0" expanded="true" />
+                <element signature="e#2135#2136#0" expanded="true" />
+                <element signature="e#2431#2432#0" expanded="true" />
+                <element signature="e#2461#2462#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="638">
+              <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+              <folding>
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -122,6 +179,7 @@
       <find>getPgDeviceByDevType</find>
       <find>message</find>
       <find>getConstructionByType</find>
+      <find>getPgCameraListByPosition</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -130,24 +188,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanTypeDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
@@ -162,17 +207,38 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
       </list>
     </option>
   </component>
@@ -208,16 +274,18 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="3" />
-    <option name="y" value="10" />
-    <option name="width" value="1386" />
-    <option name="height" value="788" />
+    <option name="x" value="1410" />
+    <option name="y" value="117" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -258,7 +326,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -267,16 +335,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -286,7 +345,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="dto" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -296,7 +355,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="manager" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -308,19 +367,10 @@
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="webapp" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -359,6 +409,7 @@
       </deployment>
       <server-settings>
         <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_7" />
+        <option name="JNDI_PORT" value="10991" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -456,7 +507,23 @@
       <workItem from="1566350810712" duration="6803000" />
       <workItem from="1566435787074" duration="10717000" />
       <workItem from="1566521753529" duration="14265000" />
-      <workItem from="1566614176989" duration="5693000" />
+      <workItem from="1566614176989" duration="14059000" />
+      <workItem from="1566780822009" duration="1026000" />
+      <workItem from="1566891563975" duration="284000" />
+      <workItem from="1566893107340" duration="3382000" />
+      <workItem from="1566953794976" duration="11039000" />
+      <workItem from="1567059357700" duration="484000" />
+      <workItem from="1567082835097" duration="1086000" />
+      <workItem from="1567126428020" duration="1539000" />
+      <workItem from="1567129277820" duration="5788000" />
+      <workItem from="1567136008996" duration="2568000" />
+      <workItem from="1567237040302" duration="111000" />
+      <workItem from="1567495626345" duration="2797000" />
+      <workItem from="1567558770152" duration="2352000" />
+      <workItem from="1567577368149" duration="640000" />
+      <workItem from="1567751224608" duration="780000" />
+      <workItem from="1568019299799" duration="695000" />
+      <workItem from="1568082566133" duration="4016000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -493,17 +560,60 @@
       <option name="project" value="LOCAL" />
       <updated>1566553388171</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="整理管线部分">
+      <created>1566620046627</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1566620046627</updated>
+    </task>
+    <task id="LOCAL-00007" summary="合并代码提交">
+      <created>1566781001910</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1566781001910</updated>
+    </task>
+    <task id="LOCAL-00008" summary="合并代码提交">
+      <created>1566963831930</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1566963831930</updated>
+    </task>
+    <task id="LOCAL-00009" summary="修改报警阈值">
+      <created>1566972146710</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1566972146710</updated>
+    </task>
+    <task id="LOCAL-00010" summary="修改巡检维护表字段">
+      <created>1567126525554</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1567126525554</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="142930000" />
+    <option name="totallyTimeSpent" value="189883000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
+    <frame x="1358" y="-8" width="1456" height="916" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29297996" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -511,13 +621,14 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Thumbnails" weight="0.3295082" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.5081967" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.3849105" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
       <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
       <window_info anchor="bottom" id="Spring" order="8" />
       <window_info anchor="bottom" id="Terminal" order="9" />
@@ -539,7 +650,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2193646" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -547,22 +658,23 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.47540984" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
-      <window_info anchor="bottom" id="Spring" order="8" />
-      <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
-      <window_info anchor="bottom" id="Statistic" order="11" />
-      <window_info anchor="bottom" id="Java Enterprise" order="12" />
-      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="14" weight="0.32786885" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.52307695" />
+      <window_info anchor="bottom" id="Thumbnails" order="0" weight="0.3295082" />
+      <window_info anchor="bottom" id="Message" order="1" />
+      <window_info anchor="bottom" id="Find" order="2" />
+      <window_info anchor="bottom" id="Run" order="3" />
+      <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.49924356" weight="0.49344262" />
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Application Servers" order="8" weight="0.3276923" />
+      <window_info anchor="bottom" id="Spring" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
+      <window_info anchor="bottom" id="Statistic" order="12" />
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <window_info anchor="bottom" id="Database Changes" order="14" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="15" weight="0.32786885" />
+      <window_info anchor="bottom" id="Messages" order="16" weight="0.5229508" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -578,6 +690,16 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -587,7 +709,11 @@
     <MESSAGE value="修改权限问题" />
     <MESSAGE value="修改人员登录返回接口" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整理管线部分" />
+    <MESSAGE value="合并代码提交" />
+    <MESSAGE value="修改报警阈值" />
+    <MESSAGE value="修改巡检维护表字段" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护表字段" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -602,322 +728,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-532">
-          <caret line="50" column="28" lean-forward="true" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="19" column="60" selection-start-line="19" selection-start-column="60" selection-end-line="19" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="100" column="34" lean-forward="true" selection-start-line="100" selection-start-column="34" selection-end-line="100" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1474">
-          <caret line="84" column="58" selection-start-line="84" selection-start-column="58" selection-end-line="84" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1100">
-          <caret line="58" column="18" selection-start-line="58" selection-start-column="18" selection-end-line="58" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6842">
-          <caret line="329" selection-start-line="329" selection-end-line="329" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="102" column="24" lean-forward="true" selection-start-line="102" selection-start-column="24" selection-end-line="102" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="72" column="56" lean-forward="true" selection-start-line="72" selection-start-column="56" selection-end-line="72" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="90" column="39" lean-forward="true" selection-start-line="90" selection-start-column="39" selection-end-line="90" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="97" column="16" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
-          <caret line="14" column="52" lean-forward="true" selection-start-line="14" selection-start-column="52" selection-end-line="14" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="26" column="34" lean-forward="true" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="61" column="1" lean-forward="true" selection-start-line="61" selection-start-column="1" selection-end-line="61" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="208" column="49" lean-forward="true" selection-start-line="208" selection-start-column="49" selection-end-line="208" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="140" column="57" selection-start-line="140" selection-start-column="57" selection-end-line="140" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="111" column="36" selection-start-line="111" selection-start-column="36" selection-end-line="111" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="3" lean-forward="true" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="81" column="58" lean-forward="true" selection-start-line="81" selection-start-column="58" selection-end-line="81" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="472">
-          <caret line="118" column="59" selection-start-line="118" selection-start-column="59" selection-end-line="118" selection-end-column="59" />
-          <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-198">
-          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="69" column="32" lean-forward="true" selection-start-line="69" selection-start-column="32" selection-end-line="70" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="142" column="59" lean-forward="true" selection-start-line="142" selection-start-column="59" selection-end-line="142" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="349" column="9" lean-forward="true" selection-start-line="349" selection-start-column="9" selection-end-line="349" selection-end-column="9" />
-          <folding>
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="e#12105#12121#0" expanded="true" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-686">
-          <caret line="67" column="31" lean-forward="true" selection-start-line="67" selection-start-column="31" selection-end-line="67" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="93" column="24" lean-forward="true" selection-start-line="93" selection-start-column="24" selection-end-line="93" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="57" column="23" lean-forward="true" selection-start-line="57" selection-start-column="23" selection-end-line="57" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-408">
-          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="98" column="40" lean-forward="true" selection-start-line="98" selection-start-column="40" selection-end-line="98" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="572">
@@ -925,13 +735,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="328" column="32" lean-forward="true" selection-start-line="328" selection-start-column="32" selection-end-line="328" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
@@ -950,16 +753,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="396">
           <caret line="23" column="32" lean-forward="true" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
-          <folding>
-            <element signature="e#2635#2636#0" expanded="true" />
-            <element signature="e#2671#2672#0" expanded="true" />
-            <element signature="e#2727#2728#0" expanded="true" />
-            <element signature="e#2777#2778#0" expanded="true" />
-            <element signature="e#2877#2878#0" expanded="true" />
-            <element signature="e#2911#2912#0" expanded="true" />
-            <element signature="e#2963#2964#0" expanded="true" />
-            <element signature="e#3009#3010#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -972,14 +765,481 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+        <state relative-caret-position="66">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="59" column="46" lean-forward="true" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3586">
+          <caret line="179" column="16" selection-start-line="179" selection-start-column="16" selection-end-line="179" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5478">
+          <caret line="273" column="3" selection-start-line="273" selection-start-column="3" selection-end-line="273" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1870">
+          <caret line="147" column="11" selection-start-line="147" selection-start-column="11" selection-end-line="147" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="55" column="15" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="106">
+          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="290" column="41" lean-forward="true" selection-start-line="290" selection-start-column="41" selection-end-line="290" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="21" column="32" lean-forward="true" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="550">
+          <caret line="38" column="89" selection-start-line="38" selection-start-column="89" selection-end-line="38" selection-end-column="89" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="11" column="28" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1166">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="818">
+          <caret line="285" column="13" lean-forward="true" selection-start-line="285" selection-start-column="13" selection-end-line="285" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="129" column="31" lean-forward="true" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="323" column="72" lean-forward="true" selection-start-line="323" selection-start-column="72" selection-end-line="323" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="44" column="13" lean-forward="true" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-638">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="244">
+          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="157">
+          <caret line="16" column="55" lean-forward="true" selection-start-line="16" selection-start-column="55" selection-end-line="16" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="270" column="33" lean-forward="true" selection-start-line="270" selection-start-column="33" selection-end-line="270" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="490">
+          <caret line="141" selection-start-line="141" selection-end-line="141" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="164" column="5" lean-forward="true" selection-start-line="164" selection-start-column="5" selection-end-line="164" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/apiTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-242">
+          <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="61" column="16" lean-forward="true" selection-start-line="61" selection-start-column="16" selection-end-line="61" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="700">
+          <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="12" column="34" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="39" column="9" lean-forward="true" selection-start-line="39" selection-start-column="9" selection-end-line="39" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="32" column="29" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="29" />
           <folding>
-            <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-            <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#1838#1839#0" expanded="true" />
+            <element signature="e#1863#1864#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1925#1926#0" expanded="true" />
+            <element signature="e#1822#1823#0" expanded="true" />
+            <element signature="e#1851#1852#0" expanded="true" />
+            <element signature="e#1895#1896#0" expanded="true" />
+            <element signature="e#1931#1932#0" expanded="true" />
+            <element signature="e#2132#2133#0" expanded="true" />
+            <element signature="e#2164#2165#0" expanded="true" />
+            <element signature="e#2214#2215#0" expanded="true" />
+            <element signature="e#2256#2257#0" expanded="true" />
+            <element signature="e#2330#2331#0" expanded="true" />
+            <element signature="e#2370#2371#0" expanded="true" />
+            <element signature="e#2436#2437#0" expanded="true" />
+            <element signature="e#2494#2495#0" expanded="true" />
+            <element signature="e#2569#2570#0" expanded="true" />
+            <element signature="e#2602#2603#0" expanded="true" />
+            <element signature="e#2654#2655#0" expanded="true" />
+            <element signature="e#2698#2699#0" expanded="true" />
+            <element signature="e#2764#2765#0" expanded="true" />
+            <element signature="e#2795#2796#0" expanded="true" />
+            <element signature="e#2843#2844#0" expanded="true" />
+            <element signature="e#2883#2884#0" expanded="true" />
+            <element signature="e#2948#2949#0" expanded="true" />
+            <element signature="e#2980#2981#0" expanded="true" />
+            <element signature="e#3030#3031#0" expanded="true" />
+            <element signature="e#3072#3073#0" expanded="true" />
+            <element signature="e#3134#3135#0" expanded="true" />
+            <element signature="e#3162#3163#0" expanded="true" />
+            <element signature="e#3204#3205#0" expanded="true" />
+            <element signature="e#3238#3239#0" expanded="true" />
+            <element signature="e#3307#3308#0" expanded="true" />
+            <element signature="e#3346#3347#0" expanded="true" />
+            <element signature="e#3410#3411#0" expanded="true" />
+            <element signature="e#3466#3467#0" expanded="true" />
+            <element signature="e#3537#3538#0" expanded="true" />
+            <element signature="e#3567#3568#0" expanded="true" />
+            <element signature="e#3613#3614#0" expanded="true" />
+            <element signature="e#3651#3652#0" expanded="true" />
+            <element signature="e#3721#3722#0" expanded="true" />
+            <element signature="e#3759#3760#0" expanded="true" />
+            <element signature="e#3821#3822#0" expanded="true" />
+            <element signature="e#3875#3876#0" expanded="true" />
+            <element signature="e#3953#3954#0" expanded="true" />
+            <element signature="e#3991#3992#0" expanded="true" />
+            <element signature="e#4053#4054#0" expanded="true" />
+            <element signature="e#4107#4108#0" expanded="true" />
+            <element signature="e#4186#4187#0" expanded="true" />
+            <element signature="e#4225#4226#0" expanded="true" />
+            <element signature="e#4289#4290#0" expanded="true" />
+            <element signature="e#4345#4346#0" expanded="true" />
+            <element signature="e#4430#4431#0" expanded="true" />
+            <element signature="e#4474#4475#0" expanded="true" />
+            <element signature="e#4698#4699#0" expanded="true" />
+            <element signature="e#4740#4741#0" expanded="true" />
+            <element signature="e#4810#4811#0" expanded="true" />
+            <element signature="e#4872#4873#0" expanded="true" />
+            <element signature="e#4955#4956#0" expanded="true" />
+            <element signature="e#4994#4995#0" expanded="true" />
+            <element signature="e#5058#5059#0" expanded="true" />
+            <element signature="e#5114#5115#0" expanded="true" />
+            <element signature="e#5194#5195#0" expanded="true" />
+            <element signature="e#5233#5234#0" expanded="true" />
+            <element signature="e#5297#5298#0" expanded="true" />
+            <element signature="e#5353#5354#0" expanded="true" />
+            <element signature="e#5428#5429#0" expanded="true" />
+            <element signature="e#5462#5463#0" expanded="true" />
+            <element signature="e#5516#5517#0" expanded="true" />
+            <element signature="e#5562#5563#0" expanded="true" />
+            <element signature="e#5634#5635#0" expanded="true" />
+            <element signature="e#5670#5671#0" expanded="true" />
+            <element signature="e#5728#5729#0" expanded="true" />
+            <element signature="e#5778#5779#0" expanded="true" />
+            <element signature="e#5852#5853#0" expanded="true" />
+            <element signature="e#5888#5889#0" expanded="true" />
+            <element signature="e#5946#5947#0" expanded="true" />
+            <element signature="e#5996#5997#0" expanded="true" />
+            <element signature="e#6067#6068#0" expanded="true" />
+            <element signature="e#6100#6101#0" expanded="true" />
+            <element signature="e#6152#6153#0" expanded="true" />
+            <element signature="e#6196#6197#0" expanded="true" />
+            <element signature="e#6261#6262#0" expanded="true" />
+            <element signature="e#6291#6292#0" expanded="true" />
+            <element signature="e#6337#6338#0" expanded="true" />
+            <element signature="e#6375#6376#0" expanded="true" />
+            <element signature="e#6437#6438#0" expanded="true" />
+            <element signature="e#6467#6468#0" expanded="true" />
+            <element signature="e#6513#6514#0" expanded="true" />
+            <element signature="e#6551#6552#0" expanded="true" />
+            <element signature="e#6613#6614#0" expanded="true" />
+            <element signature="e#6643#6644#0" expanded="true" />
+            <element signature="e#6689#6690#0" expanded="true" />
+            <element signature="e#6727#6728#0" expanded="true" />
+            <element signature="e#6796#6797#0" expanded="true" />
+            <element signature="e#6829#6830#0" expanded="true" />
+            <element signature="e#6881#6882#0" expanded="true" />
+            <element signature="e#6925#6926#0" expanded="true" />
+            <element signature="e#6995#6996#0" expanded="true" />
+            <element signature="e#7030#7031#0" expanded="true" />
+            <element signature="e#7086#7087#0" expanded="true" />
+            <element signature="e#7134#7135#0" expanded="true" />
+            <element signature="e#7202#7203#0" expanded="true" />
+            <element signature="e#7233#7234#0" expanded="true" />
+            <element signature="e#7281#7282#0" expanded="true" />
+            <element signature="e#7321#7322#0" expanded="true" />
+            <element signature="e#7390#7391#0" expanded="true" />
+            <element signature="e#7426#7427#0" expanded="true" />
+            <element signature="e#7484#7485#0" expanded="true" />
+            <element signature="e#7534#7535#0" expanded="true" />
+            <element signature="e#7602#7603#0" expanded="true" />
+            <element signature="e#7636#7637#0" expanded="true" />
+            <element signature="e#7690#7691#0" expanded="true" />
+            <element signature="e#7736#7737#0" expanded="true" />
+            <element signature="e#7806#7807#0" expanded="true" />
+            <element signature="e#7840#7841#0" expanded="true" />
+            <element signature="e#7894#7895#0" expanded="true" />
+            <element signature="e#7940#7941#0" expanded="true" />
+            <element signature="e#8006#8007#0" expanded="true" />
+            <element signature="e#8036#8037#0" expanded="true" />
+            <element signature="e#8082#8083#0" expanded="true" />
+            <element signature="e#8120#8121#0" expanded="true" />
+            <element signature="e#8189#8190#0" expanded="true" />
+            <element signature="e#8226#8227#0" expanded="true" />
+            <element signature="e#8286#8287#0" expanded="true" />
+            <element signature="e#8338#8339#0" expanded="true" />
+            <element signature="e#8417#8418#0" expanded="true" />
+            <element signature="e#8457#8458#0" expanded="true" />
+            <element signature="e#8523#8524#0" expanded="true" />
+            <element signature="e#8581#8582#0" expanded="true" />
+            <element signature="e#8655#8656#0" expanded="true" />
+            <element signature="e#8687#8688#0" expanded="true" />
+            <element signature="e#8737#8738#0" expanded="true" />
+            <element signature="e#8779#8780#0" expanded="true" />
+            <element signature="e#8846#8847#0" expanded="true" />
+            <element signature="e#8879#8880#0" expanded="true" />
+            <element signature="e#8931#8932#0" expanded="true" />
+            <element signature="e#8975#8976#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#787#788#0" expanded="true" />
+            <element signature="e#817#818#0" expanded="true" />
+            <element signature="e#2105#2106#0" expanded="true" />
+            <element signature="e#2135#2136#0" expanded="true" />
+            <element signature="e#2431#2432#0" expanded="true" />
+            <element signature="e#2461#2462#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index 854f1f1..0db633a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -165,12 +165,16 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String startDay,String endDay) {
+    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew) {
         try {
 
             Criteria criteria = createCriteria(PgAlarm.class);
             criteria.addOrder(Order.desc("id"));
 
+            if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) {
+                criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
+            }
+
             if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay))
             {
                 criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay)));
@@ -193,9 +197,11 @@
 
                 criteria.add(Restrictions.le("alarmDate",date));
             }
+            if(StringUtils.isNotBlank(isNew)&&isNew.equals("true"))
+                criteria.add(Restrictions.eq("active", 1));
 
             List<PgAlarm> pgAlarmList = criteria.list();
-            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
     }
 
     //根据设备位置(仓位)获取摄像机列表
-    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+    public List<PgDeviceDto> getPgCameraListByPosition(String partition,String position){
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.like("position",position+"%"));
-//        criteria.add(Restrictions.eq("devType","球机"));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(position))
+            criteria.add(Restrictions.like("position",position+"%"));
+
         criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
 
         List<PgDevice> pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
             dto.setDevCode(objects[5].toString());
             dto.setDevType(objects[6].toString());
             if(objects[7]!=null)
-            dto.setIp(objects[7].toString());
+                dto.setIp(objects[7].toString());
             dto.setIsOpen(objects[8].toString());
             dto.setPartition(objects[11].toString());
             dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index 8ebf74d..3c657a7 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgEquipment;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
 import com.casic.PgInterface.devTable.dto.PgEquipmentDto;
@@ -34,9 +35,12 @@
     public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
-        criteria.add(Restrictions.eq("eqName",eqName));
-        criteria.add(Restrictions.eq("eqCode",eqCode));
-        criteria.add(Restrictions.eq("eqType",eqType));
+        if(StringUtils.isNotBlank(eqName))
+            criteria.add(Restrictions.eq("eqName",eqName));
+        if(StringUtils.isNotBlank(eqCode))
+            criteria.add(Restrictions.eq("eqCode",eqCode));
+        if(StringUtils.isNotBlank(eqType))
+            criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
@@ -51,10 +55,9 @@
 
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
-        //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
         String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
-        +eqType+"' group by equipment.EQ_NAME";
+                +eqType+"' group by equipment.EQ_NAME";
 
         List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4ed68e4..e413a5c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
@@ -39,7 +40,8 @@
 
     public List<PgPipeLineDto> getPipeLineByLineType(String lineType) {
         Criteria criteria = createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineType", lineType));
+        if(StringUtils.isNotBlank(lineType))
+            criteria.add(Restrictions.eq("lineType", lineType));
 
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    private Long id;
-    private String keyId;//巡检记录单id
-    private String planId;//巡检计划ID
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    @Column(name="KEY_ID")
-    public String getKeyId() {
-        return keyId;
-    }
-
-    public void setKeyId(String keyId) {
-        this.keyId = keyId;
-    }
-
-    @Column(name="PLAN_ID")
-    public String getPlanId() {
-        return planId;
-    }
-
-    public void setPlanId(String planId) {
-        this.planId = planId;
-    }
-
-    @Column(name="CREATE_DATE")
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    @Column(name="STATE")
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    @Column(name="CREATOR")
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    @Column(name="PLAN_NAME")
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    @Column(name="RECORD_NO")
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    @Column(name="PLAN_NO")
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    @Column(name="RESPONSIBIE_DEPT")
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    @Column(name="INSPECTION_PERSON")
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    @Column(name="PATROL_MAN")
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    @Column(name="OPERATE_DATE")
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    @Column(name="REMARK")
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Column(name="BUILD_CABIN")
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    @Column(name="PROJECT")
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    @Column(name="START_PILE_NO")
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    @Column(name="END_PILE_NO")
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    @Column(name="INSPECTION_PRACE")
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    @Column(name="OTHER_PATROL_MAN")
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private Long id;
+    private String KEY_ID;//唯一键值
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_PERSON;//巡检人
+    private String START_DATE;//巡检开始时间
+    private String END_DATE;
+    private String FREQUENCY;//巡检频率
+    private String STATE;//状态
+    private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+    private String PLAN_NO;//巡检计划编号
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_MODE;//巡检方式
+    private String INSPECTION_ROUTE;//巡检路线
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String INSPECTION_GROUP;//巡检部门
+    private String INSERT_TIME;//插入时间
+    private String FREQUENCYDATE;//巡检具体日期
+    private String FREQUENCYTIME;//巡检具体时间
+    private String CREATEDATE;//创建时间
+    private String CREATOR;//创建人
+    private String PROJECT;//项目
+    private String COMLILE;//编制人
+    private String START_TIME;//编制时间
+    private String DEVELOP_DEPT;//制定部门
+    private String END_TIME;//结束时间
+    private String START_PILE_NO;//开始桩号
+    private String END_PILE_NO;//结束桩号
+    private String BUILD_CABIN;//巡检舱室
+    private String MILEAGE;
+    private String FREQUENCY_TIME;//巡检具体时间
+    private String FREQUENCYTIME_END;
+    private String KETTLE_TS;
+    private String UPDATEDATE;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="KEY_ID")
+    public String getKEY_ID() {
+        return KEY_ID;
+    }
+
+    public void setKEY_ID(String KEY_ID) {
+        this.KEY_ID = KEY_ID;
+    }
+
+    @Column(name="PLAN_NAME")
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    @Column(name="INSPECTION_PERSON")
+    public String getINSPECTION_PERSON() {
+        return INSPECTION_PERSON;
+    }
+
+    public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+        this.INSPECTION_PERSON = INSPECTION_PERSON;
+    }
+
+    @Column(name="START_DATE")
+    public String getSTART_DATE() {
+        return START_DATE;
+    }
+
+    public void setSTART_DATE(String START_DATE) {
+        this.START_DATE = START_DATE;
+    }
+
+    @Column(name="END_DATE")
+    public String getEND_DATE() {
+        return END_DATE;
+    }
+
+    public void setEND_DATE(String END_DATE) {
+        this.END_DATE = END_DATE;
+    }
+
+    @Column(name="FREQUENCY")
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    @Column(name="STATE")
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    @Column(name="RESPONSIBLE_DEPT")
+    public String getRESPONSIBLE_DEPT() {
+        return RESPONSIBLE_DEPT;
+    }
+
+    public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+        this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+    }
+
+    @Column(name="PLAN_NO")
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    @Column(name="INSPECTION_TYPE")
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    @Column(name="INSPECTION_MODE")
+    public String getINSPECTION_MODE() {
+        return INSPECTION_MODE;
+    }
+
+    public void setINSPECTION_MODE(String INSPECTION_MODE) {
+        this.INSPECTION_MODE = INSPECTION_MODE;
+    }
+
+    @Column(name="INSPECTION_ROUTE")
+    public String getINSPECTION_ROUTE() {
+        return INSPECTION_ROUTE;
+    }
+
+    public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+        this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+    }
+
+    @Column(name="INSPECTION_START_TIME")
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    @Column(name="INSPECTION_END_TIME")
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    @Column(name="INSPECTION_PRACE")
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    @Column(name="INSPECTION_GROUP")
+    public String getINSPECTION_GROUP() {
+        return INSPECTION_GROUP;
+    }
+
+    public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+        this.INSPECTION_GROUP = INSPECTION_GROUP;
+    }
+
+    @Column(name="INSERT_TIME")
+    public String getINSERT_TIME() {
+        return INSERT_TIME;
+    }
+
+    public void setINSERT_TIME(String INSERT_TIME) {
+        this.INSERT_TIME = INSERT_TIME;
+    }
+
+    @Column(name="FREQUENCYDATE")
+    public String getFREQUENCYDATE() {
+        return FREQUENCYDATE;
+    }
+
+    public void setFREQUENCYDATE(String FREQUENCYDATE) {
+        this.FREQUENCYDATE = FREQUENCYDATE;
+    }
+
+    @Column(name="FREQUENCYTIME")
+    public String getFREQUENCYTIME() {
+        return FREQUENCYTIME;
+    }
+
+    public void setFREQUENCYTIME(String FREQUENCYTIME) {
+        this.FREQUENCYTIME = FREQUENCYTIME;
+    }
+
+    @Column(name="CREATEDATE")
+    public String getCREATEDATE() {
+        return CREATEDATE;
+    }
+
+    public void setCREATEDATE(String CREATEDATE) {
+        this.CREATEDATE = CREATEDATE;
+    }
+
+    @Column(name="CREATOR")
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    @Column(name="PROJECT")
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    @Column(name="COMLILE")
+    public String getCOMLILE() {
+        return COMLILE;
+    }
+
+    public void setCOMLILE(String COMLILE) {
+        this.COMLILE = COMLILE;
+    }
+
+    @Column(name="START_TIME")
+    public String getSTART_TIME() {
+        return START_TIME;
+    }
+
+    public void setSTART_TIME(String START_TIME) {
+        this.START_TIME = START_TIME;
+    }
+
+    @Column(name="DEVELOP_DEPT")
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    @Column(name="END_TIME")
+    public String getEND_TIME() {
+        return END_TIME;
+    }
+
+    public void setEND_TIME(String END_TIME) {
+        this.END_TIME = END_TIME;
+    }
+
+    @Column(name="START_PILE_NO")
+    public String getSTART_PILE_NO() {
+        return START_PILE_NO;
+    }
+
+    public void setSTART_PILE_NO(String START_PILE_NO) {
+        this.START_PILE_NO = START_PILE_NO;
+    }
+
+    @Column(name="END_PILE_NO")
+    public String getEND_PILE_NO() {
+        return END_PILE_NO;
+    }
+
+    public void setEND_PILE_NO(String END_PILE_NO) {
+        this.END_PILE_NO = END_PILE_NO;
+    }
+
+    @Column(name="BUILD_CABIN")
+    public String getBUILD_CABIN() {
+        return BUILD_CABIN;
+    }
+
+    public void setBUILD_CABIN(String BUILD_CABIN) {
+        this.BUILD_CABIN = BUILD_CABIN;
+    }
+
+    @Column(name="MILEAGE")
+    public String getMILEAGE() {
+        return MILEAGE;
+    }
+
+    public void setMILEAGE(String MILEAGE) {
+        this.MILEAGE = MILEAGE;
+    }
+
+    @Column(name="FREQUENCY_TIME")
+    public String getFREQUENCY_TIME() {
+        return FREQUENCY_TIME;
+    }
+
+    public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+        this.FREQUENCY_TIME = FREQUENCY_TIME;
+    }
+
+    @Column(name="FREQUENCYTIME_END")
+    public String getFREQUENCYTIME_END() {
+        return FREQUENCYTIME_END;
+    }
+
+    public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+        this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+    }
+
+    @Column(name="KETTLE_TS")
+    public String getKETTLE_TS() {
+        return KETTLE_TS;
+    }
+
+    public void setKETTLE_TS(String KETTLE_TS) {
+        this.KETTLE_TS = KETTLE_TS;
+    }
+
+    @Column(name="UPDATEDATE")
+    public String getUPDATEDATE() {
+        return UPDATEDATE;
+    }
+
+    public void setUPDATEDATE(String UPDATEDATE) {
+        this.UPDATEDATE = UPDATEDATE;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 5346b57..2f8d359 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -66,7 +66,7 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REPAIRMAN")
+    @Column(name="REOAIRMAN")
     public String getRepairMan() {
         return repairMan;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
-    private Long id;
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-
-
-    public static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
-        PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
-        pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
-        pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
-        pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
-        pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
-        pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
-        pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
-        pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
-        pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
-        pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
-        pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
-        pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
-        pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
-        pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
-        pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
-        return pgAssetInSpectionRecordDto;
-    }
-
-
-    public static List<PgAssetInSpectionRecordDto> ConvertToDtoList(List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList){
-        List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-        for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
-            pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
-        }
-
-        return pgAssetInSpectionRecordDtoList;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
-    private String num;
-    private String createDate;
-
-    public String getNum() {
-        return num;
-    }
-
-    public void setNum(String num) {
-        this.num = num;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+    private Long id;
+    private String PLAN_NO;//巡检计划编号
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String FREQUENCY;//巡检频率
+    private String CREATOR;//创建人
+    private String DEVELOP_DEPT;//制定部门
+    private String PROJECT;//项目
+    private String STATE;//状态
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+        PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+        pgAssetPlanDto.setId(pgAssetPlan.getId());
+        pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+        pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+        pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+        pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+        pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+        pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+        pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+        pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+        pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+        pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+        pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+        return pgAssetPlanDto;
+    }
+
+    public static List<PgAssetPlanDto> ConvertToPgAssetDtoList(List<PgAssetPlan> pgAssetPlanList){
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
+
+        for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+            pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+        }
+
+        return pgAssetPlanDtoList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
new file mode 100644
index 0000000..bc12db1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
@@ -0,0 +1,24 @@
+package com.casic.PgInterface.maintenance.dto;
+
+public class PgAssetPlanStatic {
+
+    private String num;
+    private String createDate;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
deleted file mode 100644
index c41ca7d..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.casic.PgInterface.maintenance.manager;
-
-import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
-
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
-        try {
-            String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
-                    "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
-                    "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-
-            if(patrolMan!=null)
-                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
-            if(startTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
-            if(endTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')<to_date('"+endTime+"','yyyy-MM-dd')";
-
-            sql+=" order by id";
-
-            List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
-
-            List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList=new ArrayList<>();
-            for(Object[] objects1:objects){
-                PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord();
-
-                pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString()));
-                pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1]));
-                pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2]));
-                pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3]));
-                pgAssetInSpectionRecord.setState(String.valueOf(objects1[4]));
-                pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5]));
-                pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6]));
-                pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7]));
-                pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8]));
-                pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9]));
-                pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10]));
-                pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11]));
-                pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12]));
-                pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13]));
-                pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14]));
-                pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15]));
-                pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16]));
-                pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17]));
-                pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18]));
-                pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19]));
-
-                pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord);
-            }
-
-            List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-            for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList)
-            {
-                pgAssetInSpectionRecordDtoList.add(PgAssetInSpectionRecordDto.ConvertToDto(pgAssetInSpectionRecord));
-            }
-
-            return pgAssetInSpectionRecordDtoList;
-        }
-        catch(Exception e)
-        {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public List<PgAssetInSpectionRecordStatic> getPgAssetInSpectionRecordStaticLisByTime(
-            String startTime, String endTime, String staticType) {
-
-        String sql="";
-        String dateType="";
-        List<PgAssetInSpectionRecordStatic> pgAssetInSpectionRecordStaticList=new ArrayList<>();
-        int type=Integer.valueOf(staticType);
-
-        switch(type) {
-            case 0://年
-                dateType = "yyyy";
-                break;
-            case 1://月
-                dateType = "yyyy-mm";
-                break;
-            case 2://周
-                dateType = "iw";
-                break;
-            case 3://日
-                dateType="yyyy-mm-dd";
-                break;
-            default:
-                break;
-        }
-
-        sql="select count(*), to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_RECORD t where 1=1";
-
-        if(startTime!=null)
-            sql+=" and t.CREATE_DATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
-        if(endTime!=null)
-            sql+=" and t.CREATE_DATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
-
-        sql+=" group by to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"')";
-
-        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
-        for(int i=0;i<objects.size();i++)
-        {
-            PgAssetInSpectionRecordStatic pgAssetInSpectionRecordStatic=new PgAssetInSpectionRecordStatic();
-            pgAssetInSpectionRecordStatic.setNum(objects.get(i)[0].toString());
-            pgAssetInSpectionRecordStatic.setCreateDate(objects.get(i)[1].toString());
-            pgAssetInSpectionRecordStaticList.add(pgAssetInSpectionRecordStatic);
-        }
-        return pgAssetInSpectionRecordStaticList;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
new file mode 100644
index 0000000..bb6bf1e
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
@@ -0,0 +1,81 @@
+package com.casic.PgInterface.maintenance.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgAssetPlanManager extends HibernateEntityDao<PgAssetPlan> {
+
+    public List<PgAssetPlanDto> getPgAssetPlanDtoList(String inSpectionPlace){
+        Criteria criteria=createCriteria(PgAssetPlan.class);
+
+        if(StringUtils.isNotBlank(inSpectionPlace))
+            criteria.add(Restrictions.like("INSPECTION_PRACE","%"+inSpectionPlace+"%"));
+        criteria.addOrder(Order.desc("id"));
+
+        List<PgAssetPlan> pgAssetPlanList=criteria.list();
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=PgAssetPlanDto.ConvertToPgAssetDtoList(pgAssetPlanList);
+
+        if(pgAssetPlanDtoList==null||pgAssetPlanDtoList.size()==0)
+            return null;
+        else
+            return pgAssetPlanDtoList;
+    }
+
+    public List<PgAssetPlanStatic> getPgAssetPlanStaticLisByTime(
+            String startTime, String endTime, String staticType) {
+
+        String sql="";
+        String dateType="";
+        List<PgAssetPlanStatic> pgAssetPlanStaticList=new ArrayList<>();
+        int type=Integer.valueOf(staticType);
+
+        switch(type) {
+            case 0://年
+                dateType = "yyyy";
+                break;
+            case 1://月
+                dateType = "yyyy-mm";
+                break;
+            case 2://周
+                dateType = "iw";
+                break;
+            case 3://日
+                dateType="yyyy-mm-dd";
+                break;
+            default:
+                break;
+        }
+
+        sql="select count(*), to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_PLAN t where 1=1";
+
+        if(startTime!=null)
+            sql+=" and t.CREATEDATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
+        if(endTime!=null)
+            sql+=" and t.CREATEDATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
+
+        sql+=" group by to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"')";
+
+        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
+        for(int i=0;i<objects.size();i++)
+        {
+            PgAssetPlanStatic pgAssetPlanStatic=new PgAssetPlanStatic();
+            pgAssetPlanStatic.setNum(objects.get(i)[0].toString());
+            pgAssetPlanStatic.setCreateDate(objects.get(i)[1].toString());
+            pgAssetPlanStaticList.add(pgAssetPlanStatic);
+        }
+        return pgAssetPlanStaticList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 0903f22..3484739 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -15,7 +15,7 @@
 
     public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
             if(repairMan!=null)
                 sql+=" and REPAIRMAN like '%"+repairMan+"%'";
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index 9cc2881..6d90d7b 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -1,5 +1,7 @@
 package com.casic.PgInterface.patroler.dto;
 
+import com.casic.PgInterface.devTable.domain.PgDevice;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 
 /**
@@ -14,6 +16,7 @@
     private String unit;//单位
     private String alarmType;//报警类型
     private Long pgDeviceId;//设备编号
+    private String assetCode;//资产编号
 
     public Long getId() {
         return id;
@@ -71,7 +74,15 @@
         this.pgDeviceId = pgDeviceId;
     }
 
-    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
+    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule, PgDeviceManager pgDeviceManager) {
         this.setId(pgAlarmRule.getId());
         this.setHighValue(pgAlarmRule.getHighValue());
         this.setLowValue(pgAlarmRule.getLowValue());
@@ -82,6 +93,10 @@
         else
             this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
         this.setPgDeviceId(pgAlarmRule.getPgDeviceId());
+        if(pgAlarmRule.getAlarmTypeId()!=null&&pgDeviceManager.get(pgAlarmRule.getPgDeviceId())!=null)
+            this.setAssetCode(pgDeviceManager.get(pgAlarmRule.getPgDeviceId()).getAssetCode());
+        else
+            this.setAssetCode("");
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
index c132c98..a7cef5b 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
@@ -1,13 +1,17 @@
 package com.casic.PgInterface.patroler.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.ResponseStatus;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -17,30 +21,23 @@
 @Service
 public class PgAlarmRuleManager extends HibernateEntityDao<PgAlarmRule> {
 
+    @Resource
+    private PgDeviceManager pgDeviceManager;
+
     //根据设备获取设备报警阈值
-    public List<PgAlarmRuleDto>  getAlarmRuleDto() {
+    public List<PgAlarmRuleDto>  getAlarmRuleDto(String devType) {
         Criteria criteria=createCriteria(PgAlarmRule.class);
+
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.eq("devType", devType));
         criteria.addOrder(Order.desc("id"));
 
         List<PgAlarmRule> pgAlarmRuleList=criteria.list();
-        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
+        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         for (PgAlarmRule pgAlarmRule : pgAlarmRuleList) {
-            pgAlarmRuleDtoList.add(new PgAlarmRuleDto(pgAlarmRule));
+            pgAlarmRuleDtoList.add(new PgAlarmRuleDto(pgAlarmRule,pgDeviceManager));
         }
         return pgAlarmRuleDtoList;
-
     }
 
-    public PgAlarmRule getAlarmRuleBydevType(String devType) {
-        Criteria criteria=createCriteria(PgAlarmRule.class);
-        criteria.add(Restrictions.eq("devType", devType));
-
-        List<PgAlarmRule> pgAlarmRuleList=criteria.list();
-
-        if(pgAlarmRuleList==null||pgAlarmRuleList.size()==0)
-            return null;
-        else
-            return pgAlarmRuleList.get(0);
-    }
-
-}
+}
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ff69e2a..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,27 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190828.docx" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -32,72 +42,119 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="2" />
-          <entry key="java" value="243" />
-          <entry key="properties" value="6" />
+          <entry key="java" value="321" />
+          <entry key="properties" value="8" />
           <entry key="xml" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
-          <entry key="JAVA" value="243" />
-          <entry key="Properties" value="6" />
+          <entry key="JAVA" value="321" />
+          <entry key="Properties" value="8" />
           <entry key="XML" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="8082" />
-          <entry key="properties" value="49" />
-          <entry key="txt" value="64" />
+          <entry key="dummy" value="16" />
+          <entry key="java" value="10723" />
+          <entry key="properties" value="59" />
+          <entry key="txt" value="118" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="8082" />
-          <entry key="PLAIN_TEXT" value="64" />
-          <entry key="Properties" value="49" />
+          <entry key="JAVA" value="10723" />
+          <entry key="PLAIN_TEXT" value="134" />
+          <entry key="Properties" value="59" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="4" />
+          <entry key="project.closed" value="28" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
           <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.24" value="1" />
+          <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="1" />
-          <entry key="project.open.time.3" value="3" />
-          <entry key="project.open.time.31" value="1" />
+          <entry key="project.open.time.28" value="1" />
+          <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.31" value="2" />
           <entry key="project.open.time.37" value="1" />
+          <entry key="project.open.time.39" value="2" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.40" value="1" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="1" />
+          <entry key="project.open.time.44" value="2" />
           <entry key="project.open.time.45" value="2" />
           <entry key="project.open.time.48" value="1" />
           <entry key="project.open.time.49" value="1" />
+          <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.58" value="1" />
           <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.71" value="1" />
+          <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.71" value="2" />
           <entry key="project.open.time.76" value="1" />
-          <entry key="project.opened" value="25" />
+          <entry key="project.opened" value="41" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+            <state relative-caret-position="174">
+              <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
               <folding>
-                <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-                <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="352">
+              <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#787#788#0" expanded="true" />
+                <element signature="e#817#818#0" expanded="true" />
+                <element signature="e#2105#2106#0" expanded="true" />
+                <element signature="e#2135#2136#0" expanded="true" />
+                <element signature="e#2431#2432#0" expanded="true" />
+                <element signature="e#2461#2462#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="638">
+              <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+              <folding>
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -122,6 +179,7 @@
       <find>getPgDeviceByDevType</find>
       <find>message</find>
       <find>getConstructionByType</find>
+      <find>getPgCameraListByPosition</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -130,24 +188,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanTypeDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
@@ -162,17 +207,38 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
       </list>
     </option>
   </component>
@@ -208,16 +274,18 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="3" />
-    <option name="y" value="10" />
-    <option name="width" value="1386" />
-    <option name="height" value="788" />
+    <option name="x" value="1410" />
+    <option name="y" value="117" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -258,7 +326,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -267,16 +335,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -286,7 +345,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="dto" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -296,7 +355,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="manager" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -308,19 +367,10 @@
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="webapp" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -359,6 +409,7 @@
       </deployment>
       <server-settings>
         <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_7" />
+        <option name="JNDI_PORT" value="10991" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -456,7 +507,23 @@
       <workItem from="1566350810712" duration="6803000" />
       <workItem from="1566435787074" duration="10717000" />
       <workItem from="1566521753529" duration="14265000" />
-      <workItem from="1566614176989" duration="5693000" />
+      <workItem from="1566614176989" duration="14059000" />
+      <workItem from="1566780822009" duration="1026000" />
+      <workItem from="1566891563975" duration="284000" />
+      <workItem from="1566893107340" duration="3382000" />
+      <workItem from="1566953794976" duration="11039000" />
+      <workItem from="1567059357700" duration="484000" />
+      <workItem from="1567082835097" duration="1086000" />
+      <workItem from="1567126428020" duration="1539000" />
+      <workItem from="1567129277820" duration="5788000" />
+      <workItem from="1567136008996" duration="2568000" />
+      <workItem from="1567237040302" duration="111000" />
+      <workItem from="1567495626345" duration="2797000" />
+      <workItem from="1567558770152" duration="2352000" />
+      <workItem from="1567577368149" duration="640000" />
+      <workItem from="1567751224608" duration="780000" />
+      <workItem from="1568019299799" duration="695000" />
+      <workItem from="1568082566133" duration="4016000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -493,17 +560,60 @@
       <option name="project" value="LOCAL" />
       <updated>1566553388171</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="整理管线部分">
+      <created>1566620046627</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1566620046627</updated>
+    </task>
+    <task id="LOCAL-00007" summary="合并代码提交">
+      <created>1566781001910</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1566781001910</updated>
+    </task>
+    <task id="LOCAL-00008" summary="合并代码提交">
+      <created>1566963831930</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1566963831930</updated>
+    </task>
+    <task id="LOCAL-00009" summary="修改报警阈值">
+      <created>1566972146710</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1566972146710</updated>
+    </task>
+    <task id="LOCAL-00010" summary="修改巡检维护表字段">
+      <created>1567126525554</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1567126525554</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="142930000" />
+    <option name="totallyTimeSpent" value="189883000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
+    <frame x="1358" y="-8" width="1456" height="916" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29297996" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -511,13 +621,14 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Thumbnails" weight="0.3295082" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.5081967" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.3849105" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
       <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
       <window_info anchor="bottom" id="Spring" order="8" />
       <window_info anchor="bottom" id="Terminal" order="9" />
@@ -539,7 +650,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2193646" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -547,22 +658,23 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.47540984" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
-      <window_info anchor="bottom" id="Spring" order="8" />
-      <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
-      <window_info anchor="bottom" id="Statistic" order="11" />
-      <window_info anchor="bottom" id="Java Enterprise" order="12" />
-      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="14" weight="0.32786885" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.52307695" />
+      <window_info anchor="bottom" id="Thumbnails" order="0" weight="0.3295082" />
+      <window_info anchor="bottom" id="Message" order="1" />
+      <window_info anchor="bottom" id="Find" order="2" />
+      <window_info anchor="bottom" id="Run" order="3" />
+      <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.49924356" weight="0.49344262" />
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Application Servers" order="8" weight="0.3276923" />
+      <window_info anchor="bottom" id="Spring" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
+      <window_info anchor="bottom" id="Statistic" order="12" />
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <window_info anchor="bottom" id="Database Changes" order="14" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="15" weight="0.32786885" />
+      <window_info anchor="bottom" id="Messages" order="16" weight="0.5229508" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -578,6 +690,16 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -587,7 +709,11 @@
     <MESSAGE value="修改权限问题" />
     <MESSAGE value="修改人员登录返回接口" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整理管线部分" />
+    <MESSAGE value="合并代码提交" />
+    <MESSAGE value="修改报警阈值" />
+    <MESSAGE value="修改巡检维护表字段" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护表字段" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -602,322 +728,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-532">
-          <caret line="50" column="28" lean-forward="true" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="19" column="60" selection-start-line="19" selection-start-column="60" selection-end-line="19" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="100" column="34" lean-forward="true" selection-start-line="100" selection-start-column="34" selection-end-line="100" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1474">
-          <caret line="84" column="58" selection-start-line="84" selection-start-column="58" selection-end-line="84" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1100">
-          <caret line="58" column="18" selection-start-line="58" selection-start-column="18" selection-end-line="58" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6842">
-          <caret line="329" selection-start-line="329" selection-end-line="329" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="102" column="24" lean-forward="true" selection-start-line="102" selection-start-column="24" selection-end-line="102" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="72" column="56" lean-forward="true" selection-start-line="72" selection-start-column="56" selection-end-line="72" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="90" column="39" lean-forward="true" selection-start-line="90" selection-start-column="39" selection-end-line="90" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="97" column="16" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
-          <caret line="14" column="52" lean-forward="true" selection-start-line="14" selection-start-column="52" selection-end-line="14" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="26" column="34" lean-forward="true" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="61" column="1" lean-forward="true" selection-start-line="61" selection-start-column="1" selection-end-line="61" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="208" column="49" lean-forward="true" selection-start-line="208" selection-start-column="49" selection-end-line="208" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="140" column="57" selection-start-line="140" selection-start-column="57" selection-end-line="140" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="111" column="36" selection-start-line="111" selection-start-column="36" selection-end-line="111" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="3" lean-forward="true" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="81" column="58" lean-forward="true" selection-start-line="81" selection-start-column="58" selection-end-line="81" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="472">
-          <caret line="118" column="59" selection-start-line="118" selection-start-column="59" selection-end-line="118" selection-end-column="59" />
-          <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-198">
-          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="69" column="32" lean-forward="true" selection-start-line="69" selection-start-column="32" selection-end-line="70" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="142" column="59" lean-forward="true" selection-start-line="142" selection-start-column="59" selection-end-line="142" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="349" column="9" lean-forward="true" selection-start-line="349" selection-start-column="9" selection-end-line="349" selection-end-column="9" />
-          <folding>
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="e#12105#12121#0" expanded="true" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-686">
-          <caret line="67" column="31" lean-forward="true" selection-start-line="67" selection-start-column="31" selection-end-line="67" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="93" column="24" lean-forward="true" selection-start-line="93" selection-start-column="24" selection-end-line="93" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="57" column="23" lean-forward="true" selection-start-line="57" selection-start-column="23" selection-end-line="57" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-408">
-          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="98" column="40" lean-forward="true" selection-start-line="98" selection-start-column="40" selection-end-line="98" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="572">
@@ -925,13 +735,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="328" column="32" lean-forward="true" selection-start-line="328" selection-start-column="32" selection-end-line="328" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
@@ -950,16 +753,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="396">
           <caret line="23" column="32" lean-forward="true" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
-          <folding>
-            <element signature="e#2635#2636#0" expanded="true" />
-            <element signature="e#2671#2672#0" expanded="true" />
-            <element signature="e#2727#2728#0" expanded="true" />
-            <element signature="e#2777#2778#0" expanded="true" />
-            <element signature="e#2877#2878#0" expanded="true" />
-            <element signature="e#2911#2912#0" expanded="true" />
-            <element signature="e#2963#2964#0" expanded="true" />
-            <element signature="e#3009#3010#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -972,14 +765,481 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+        <state relative-caret-position="66">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="59" column="46" lean-forward="true" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3586">
+          <caret line="179" column="16" selection-start-line="179" selection-start-column="16" selection-end-line="179" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5478">
+          <caret line="273" column="3" selection-start-line="273" selection-start-column="3" selection-end-line="273" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1870">
+          <caret line="147" column="11" selection-start-line="147" selection-start-column="11" selection-end-line="147" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="55" column="15" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="106">
+          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="290" column="41" lean-forward="true" selection-start-line="290" selection-start-column="41" selection-end-line="290" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="21" column="32" lean-forward="true" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="550">
+          <caret line="38" column="89" selection-start-line="38" selection-start-column="89" selection-end-line="38" selection-end-column="89" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="11" column="28" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1166">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="818">
+          <caret line="285" column="13" lean-forward="true" selection-start-line="285" selection-start-column="13" selection-end-line="285" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="129" column="31" lean-forward="true" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="323" column="72" lean-forward="true" selection-start-line="323" selection-start-column="72" selection-end-line="323" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="44" column="13" lean-forward="true" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-638">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="244">
+          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="157">
+          <caret line="16" column="55" lean-forward="true" selection-start-line="16" selection-start-column="55" selection-end-line="16" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="270" column="33" lean-forward="true" selection-start-line="270" selection-start-column="33" selection-end-line="270" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="490">
+          <caret line="141" selection-start-line="141" selection-end-line="141" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="164" column="5" lean-forward="true" selection-start-line="164" selection-start-column="5" selection-end-line="164" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/apiTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-242">
+          <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="61" column="16" lean-forward="true" selection-start-line="61" selection-start-column="16" selection-end-line="61" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="700">
+          <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="12" column="34" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="39" column="9" lean-forward="true" selection-start-line="39" selection-start-column="9" selection-end-line="39" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="32" column="29" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="29" />
           <folding>
-            <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-            <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#1838#1839#0" expanded="true" />
+            <element signature="e#1863#1864#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1925#1926#0" expanded="true" />
+            <element signature="e#1822#1823#0" expanded="true" />
+            <element signature="e#1851#1852#0" expanded="true" />
+            <element signature="e#1895#1896#0" expanded="true" />
+            <element signature="e#1931#1932#0" expanded="true" />
+            <element signature="e#2132#2133#0" expanded="true" />
+            <element signature="e#2164#2165#0" expanded="true" />
+            <element signature="e#2214#2215#0" expanded="true" />
+            <element signature="e#2256#2257#0" expanded="true" />
+            <element signature="e#2330#2331#0" expanded="true" />
+            <element signature="e#2370#2371#0" expanded="true" />
+            <element signature="e#2436#2437#0" expanded="true" />
+            <element signature="e#2494#2495#0" expanded="true" />
+            <element signature="e#2569#2570#0" expanded="true" />
+            <element signature="e#2602#2603#0" expanded="true" />
+            <element signature="e#2654#2655#0" expanded="true" />
+            <element signature="e#2698#2699#0" expanded="true" />
+            <element signature="e#2764#2765#0" expanded="true" />
+            <element signature="e#2795#2796#0" expanded="true" />
+            <element signature="e#2843#2844#0" expanded="true" />
+            <element signature="e#2883#2884#0" expanded="true" />
+            <element signature="e#2948#2949#0" expanded="true" />
+            <element signature="e#2980#2981#0" expanded="true" />
+            <element signature="e#3030#3031#0" expanded="true" />
+            <element signature="e#3072#3073#0" expanded="true" />
+            <element signature="e#3134#3135#0" expanded="true" />
+            <element signature="e#3162#3163#0" expanded="true" />
+            <element signature="e#3204#3205#0" expanded="true" />
+            <element signature="e#3238#3239#0" expanded="true" />
+            <element signature="e#3307#3308#0" expanded="true" />
+            <element signature="e#3346#3347#0" expanded="true" />
+            <element signature="e#3410#3411#0" expanded="true" />
+            <element signature="e#3466#3467#0" expanded="true" />
+            <element signature="e#3537#3538#0" expanded="true" />
+            <element signature="e#3567#3568#0" expanded="true" />
+            <element signature="e#3613#3614#0" expanded="true" />
+            <element signature="e#3651#3652#0" expanded="true" />
+            <element signature="e#3721#3722#0" expanded="true" />
+            <element signature="e#3759#3760#0" expanded="true" />
+            <element signature="e#3821#3822#0" expanded="true" />
+            <element signature="e#3875#3876#0" expanded="true" />
+            <element signature="e#3953#3954#0" expanded="true" />
+            <element signature="e#3991#3992#0" expanded="true" />
+            <element signature="e#4053#4054#0" expanded="true" />
+            <element signature="e#4107#4108#0" expanded="true" />
+            <element signature="e#4186#4187#0" expanded="true" />
+            <element signature="e#4225#4226#0" expanded="true" />
+            <element signature="e#4289#4290#0" expanded="true" />
+            <element signature="e#4345#4346#0" expanded="true" />
+            <element signature="e#4430#4431#0" expanded="true" />
+            <element signature="e#4474#4475#0" expanded="true" />
+            <element signature="e#4698#4699#0" expanded="true" />
+            <element signature="e#4740#4741#0" expanded="true" />
+            <element signature="e#4810#4811#0" expanded="true" />
+            <element signature="e#4872#4873#0" expanded="true" />
+            <element signature="e#4955#4956#0" expanded="true" />
+            <element signature="e#4994#4995#0" expanded="true" />
+            <element signature="e#5058#5059#0" expanded="true" />
+            <element signature="e#5114#5115#0" expanded="true" />
+            <element signature="e#5194#5195#0" expanded="true" />
+            <element signature="e#5233#5234#0" expanded="true" />
+            <element signature="e#5297#5298#0" expanded="true" />
+            <element signature="e#5353#5354#0" expanded="true" />
+            <element signature="e#5428#5429#0" expanded="true" />
+            <element signature="e#5462#5463#0" expanded="true" />
+            <element signature="e#5516#5517#0" expanded="true" />
+            <element signature="e#5562#5563#0" expanded="true" />
+            <element signature="e#5634#5635#0" expanded="true" />
+            <element signature="e#5670#5671#0" expanded="true" />
+            <element signature="e#5728#5729#0" expanded="true" />
+            <element signature="e#5778#5779#0" expanded="true" />
+            <element signature="e#5852#5853#0" expanded="true" />
+            <element signature="e#5888#5889#0" expanded="true" />
+            <element signature="e#5946#5947#0" expanded="true" />
+            <element signature="e#5996#5997#0" expanded="true" />
+            <element signature="e#6067#6068#0" expanded="true" />
+            <element signature="e#6100#6101#0" expanded="true" />
+            <element signature="e#6152#6153#0" expanded="true" />
+            <element signature="e#6196#6197#0" expanded="true" />
+            <element signature="e#6261#6262#0" expanded="true" />
+            <element signature="e#6291#6292#0" expanded="true" />
+            <element signature="e#6337#6338#0" expanded="true" />
+            <element signature="e#6375#6376#0" expanded="true" />
+            <element signature="e#6437#6438#0" expanded="true" />
+            <element signature="e#6467#6468#0" expanded="true" />
+            <element signature="e#6513#6514#0" expanded="true" />
+            <element signature="e#6551#6552#0" expanded="true" />
+            <element signature="e#6613#6614#0" expanded="true" />
+            <element signature="e#6643#6644#0" expanded="true" />
+            <element signature="e#6689#6690#0" expanded="true" />
+            <element signature="e#6727#6728#0" expanded="true" />
+            <element signature="e#6796#6797#0" expanded="true" />
+            <element signature="e#6829#6830#0" expanded="true" />
+            <element signature="e#6881#6882#0" expanded="true" />
+            <element signature="e#6925#6926#0" expanded="true" />
+            <element signature="e#6995#6996#0" expanded="true" />
+            <element signature="e#7030#7031#0" expanded="true" />
+            <element signature="e#7086#7087#0" expanded="true" />
+            <element signature="e#7134#7135#0" expanded="true" />
+            <element signature="e#7202#7203#0" expanded="true" />
+            <element signature="e#7233#7234#0" expanded="true" />
+            <element signature="e#7281#7282#0" expanded="true" />
+            <element signature="e#7321#7322#0" expanded="true" />
+            <element signature="e#7390#7391#0" expanded="true" />
+            <element signature="e#7426#7427#0" expanded="true" />
+            <element signature="e#7484#7485#0" expanded="true" />
+            <element signature="e#7534#7535#0" expanded="true" />
+            <element signature="e#7602#7603#0" expanded="true" />
+            <element signature="e#7636#7637#0" expanded="true" />
+            <element signature="e#7690#7691#0" expanded="true" />
+            <element signature="e#7736#7737#0" expanded="true" />
+            <element signature="e#7806#7807#0" expanded="true" />
+            <element signature="e#7840#7841#0" expanded="true" />
+            <element signature="e#7894#7895#0" expanded="true" />
+            <element signature="e#7940#7941#0" expanded="true" />
+            <element signature="e#8006#8007#0" expanded="true" />
+            <element signature="e#8036#8037#0" expanded="true" />
+            <element signature="e#8082#8083#0" expanded="true" />
+            <element signature="e#8120#8121#0" expanded="true" />
+            <element signature="e#8189#8190#0" expanded="true" />
+            <element signature="e#8226#8227#0" expanded="true" />
+            <element signature="e#8286#8287#0" expanded="true" />
+            <element signature="e#8338#8339#0" expanded="true" />
+            <element signature="e#8417#8418#0" expanded="true" />
+            <element signature="e#8457#8458#0" expanded="true" />
+            <element signature="e#8523#8524#0" expanded="true" />
+            <element signature="e#8581#8582#0" expanded="true" />
+            <element signature="e#8655#8656#0" expanded="true" />
+            <element signature="e#8687#8688#0" expanded="true" />
+            <element signature="e#8737#8738#0" expanded="true" />
+            <element signature="e#8779#8780#0" expanded="true" />
+            <element signature="e#8846#8847#0" expanded="true" />
+            <element signature="e#8879#8880#0" expanded="true" />
+            <element signature="e#8931#8932#0" expanded="true" />
+            <element signature="e#8975#8976#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#787#788#0" expanded="true" />
+            <element signature="e#817#818#0" expanded="true" />
+            <element signature="e#2105#2106#0" expanded="true" />
+            <element signature="e#2135#2136#0" expanded="true" />
+            <element signature="e#2431#2432#0" expanded="true" />
+            <element signature="e#2461#2462#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index 854f1f1..0db633a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -165,12 +165,16 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String startDay,String endDay) {
+    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew) {
         try {
 
             Criteria criteria = createCriteria(PgAlarm.class);
             criteria.addOrder(Order.desc("id"));
 
+            if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) {
+                criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
+            }
+
             if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay))
             {
                 criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay)));
@@ -193,9 +197,11 @@
 
                 criteria.add(Restrictions.le("alarmDate",date));
             }
+            if(StringUtils.isNotBlank(isNew)&&isNew.equals("true"))
+                criteria.add(Restrictions.eq("active", 1));
 
             List<PgAlarm> pgAlarmList = criteria.list();
-            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
     }
 
     //根据设备位置(仓位)获取摄像机列表
-    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+    public List<PgDeviceDto> getPgCameraListByPosition(String partition,String position){
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.like("position",position+"%"));
-//        criteria.add(Restrictions.eq("devType","球机"));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(position))
+            criteria.add(Restrictions.like("position",position+"%"));
+
         criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
 
         List<PgDevice> pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
             dto.setDevCode(objects[5].toString());
             dto.setDevType(objects[6].toString());
             if(objects[7]!=null)
-            dto.setIp(objects[7].toString());
+                dto.setIp(objects[7].toString());
             dto.setIsOpen(objects[8].toString());
             dto.setPartition(objects[11].toString());
             dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index 8ebf74d..3c657a7 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgEquipment;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
 import com.casic.PgInterface.devTable.dto.PgEquipmentDto;
@@ -34,9 +35,12 @@
     public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
-        criteria.add(Restrictions.eq("eqName",eqName));
-        criteria.add(Restrictions.eq("eqCode",eqCode));
-        criteria.add(Restrictions.eq("eqType",eqType));
+        if(StringUtils.isNotBlank(eqName))
+            criteria.add(Restrictions.eq("eqName",eqName));
+        if(StringUtils.isNotBlank(eqCode))
+            criteria.add(Restrictions.eq("eqCode",eqCode));
+        if(StringUtils.isNotBlank(eqType))
+            criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
@@ -51,10 +55,9 @@
 
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
-        //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
         String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
-        +eqType+"' group by equipment.EQ_NAME";
+                +eqType+"' group by equipment.EQ_NAME";
 
         List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4ed68e4..e413a5c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
@@ -39,7 +40,8 @@
 
     public List<PgPipeLineDto> getPipeLineByLineType(String lineType) {
         Criteria criteria = createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineType", lineType));
+        if(StringUtils.isNotBlank(lineType))
+            criteria.add(Restrictions.eq("lineType", lineType));
 
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    private Long id;
-    private String keyId;//巡检记录单id
-    private String planId;//巡检计划ID
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    @Column(name="KEY_ID")
-    public String getKeyId() {
-        return keyId;
-    }
-
-    public void setKeyId(String keyId) {
-        this.keyId = keyId;
-    }
-
-    @Column(name="PLAN_ID")
-    public String getPlanId() {
-        return planId;
-    }
-
-    public void setPlanId(String planId) {
-        this.planId = planId;
-    }
-
-    @Column(name="CREATE_DATE")
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    @Column(name="STATE")
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    @Column(name="CREATOR")
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    @Column(name="PLAN_NAME")
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    @Column(name="RECORD_NO")
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    @Column(name="PLAN_NO")
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    @Column(name="RESPONSIBIE_DEPT")
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    @Column(name="INSPECTION_PERSON")
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    @Column(name="PATROL_MAN")
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    @Column(name="OPERATE_DATE")
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    @Column(name="REMARK")
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Column(name="BUILD_CABIN")
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    @Column(name="PROJECT")
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    @Column(name="START_PILE_NO")
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    @Column(name="END_PILE_NO")
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    @Column(name="INSPECTION_PRACE")
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    @Column(name="OTHER_PATROL_MAN")
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private Long id;
+    private String KEY_ID;//唯一键值
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_PERSON;//巡检人
+    private String START_DATE;//巡检开始时间
+    private String END_DATE;
+    private String FREQUENCY;//巡检频率
+    private String STATE;//状态
+    private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+    private String PLAN_NO;//巡检计划编号
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_MODE;//巡检方式
+    private String INSPECTION_ROUTE;//巡检路线
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String INSPECTION_GROUP;//巡检部门
+    private String INSERT_TIME;//插入时间
+    private String FREQUENCYDATE;//巡检具体日期
+    private String FREQUENCYTIME;//巡检具体时间
+    private String CREATEDATE;//创建时间
+    private String CREATOR;//创建人
+    private String PROJECT;//项目
+    private String COMLILE;//编制人
+    private String START_TIME;//编制时间
+    private String DEVELOP_DEPT;//制定部门
+    private String END_TIME;//结束时间
+    private String START_PILE_NO;//开始桩号
+    private String END_PILE_NO;//结束桩号
+    private String BUILD_CABIN;//巡检舱室
+    private String MILEAGE;
+    private String FREQUENCY_TIME;//巡检具体时间
+    private String FREQUENCYTIME_END;
+    private String KETTLE_TS;
+    private String UPDATEDATE;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="KEY_ID")
+    public String getKEY_ID() {
+        return KEY_ID;
+    }
+
+    public void setKEY_ID(String KEY_ID) {
+        this.KEY_ID = KEY_ID;
+    }
+
+    @Column(name="PLAN_NAME")
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    @Column(name="INSPECTION_PERSON")
+    public String getINSPECTION_PERSON() {
+        return INSPECTION_PERSON;
+    }
+
+    public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+        this.INSPECTION_PERSON = INSPECTION_PERSON;
+    }
+
+    @Column(name="START_DATE")
+    public String getSTART_DATE() {
+        return START_DATE;
+    }
+
+    public void setSTART_DATE(String START_DATE) {
+        this.START_DATE = START_DATE;
+    }
+
+    @Column(name="END_DATE")
+    public String getEND_DATE() {
+        return END_DATE;
+    }
+
+    public void setEND_DATE(String END_DATE) {
+        this.END_DATE = END_DATE;
+    }
+
+    @Column(name="FREQUENCY")
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    @Column(name="STATE")
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    @Column(name="RESPONSIBLE_DEPT")
+    public String getRESPONSIBLE_DEPT() {
+        return RESPONSIBLE_DEPT;
+    }
+
+    public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+        this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+    }
+
+    @Column(name="PLAN_NO")
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    @Column(name="INSPECTION_TYPE")
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    @Column(name="INSPECTION_MODE")
+    public String getINSPECTION_MODE() {
+        return INSPECTION_MODE;
+    }
+
+    public void setINSPECTION_MODE(String INSPECTION_MODE) {
+        this.INSPECTION_MODE = INSPECTION_MODE;
+    }
+
+    @Column(name="INSPECTION_ROUTE")
+    public String getINSPECTION_ROUTE() {
+        return INSPECTION_ROUTE;
+    }
+
+    public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+        this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+    }
+
+    @Column(name="INSPECTION_START_TIME")
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    @Column(name="INSPECTION_END_TIME")
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    @Column(name="INSPECTION_PRACE")
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    @Column(name="INSPECTION_GROUP")
+    public String getINSPECTION_GROUP() {
+        return INSPECTION_GROUP;
+    }
+
+    public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+        this.INSPECTION_GROUP = INSPECTION_GROUP;
+    }
+
+    @Column(name="INSERT_TIME")
+    public String getINSERT_TIME() {
+        return INSERT_TIME;
+    }
+
+    public void setINSERT_TIME(String INSERT_TIME) {
+        this.INSERT_TIME = INSERT_TIME;
+    }
+
+    @Column(name="FREQUENCYDATE")
+    public String getFREQUENCYDATE() {
+        return FREQUENCYDATE;
+    }
+
+    public void setFREQUENCYDATE(String FREQUENCYDATE) {
+        this.FREQUENCYDATE = FREQUENCYDATE;
+    }
+
+    @Column(name="FREQUENCYTIME")
+    public String getFREQUENCYTIME() {
+        return FREQUENCYTIME;
+    }
+
+    public void setFREQUENCYTIME(String FREQUENCYTIME) {
+        this.FREQUENCYTIME = FREQUENCYTIME;
+    }
+
+    @Column(name="CREATEDATE")
+    public String getCREATEDATE() {
+        return CREATEDATE;
+    }
+
+    public void setCREATEDATE(String CREATEDATE) {
+        this.CREATEDATE = CREATEDATE;
+    }
+
+    @Column(name="CREATOR")
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    @Column(name="PROJECT")
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    @Column(name="COMLILE")
+    public String getCOMLILE() {
+        return COMLILE;
+    }
+
+    public void setCOMLILE(String COMLILE) {
+        this.COMLILE = COMLILE;
+    }
+
+    @Column(name="START_TIME")
+    public String getSTART_TIME() {
+        return START_TIME;
+    }
+
+    public void setSTART_TIME(String START_TIME) {
+        this.START_TIME = START_TIME;
+    }
+
+    @Column(name="DEVELOP_DEPT")
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    @Column(name="END_TIME")
+    public String getEND_TIME() {
+        return END_TIME;
+    }
+
+    public void setEND_TIME(String END_TIME) {
+        this.END_TIME = END_TIME;
+    }
+
+    @Column(name="START_PILE_NO")
+    public String getSTART_PILE_NO() {
+        return START_PILE_NO;
+    }
+
+    public void setSTART_PILE_NO(String START_PILE_NO) {
+        this.START_PILE_NO = START_PILE_NO;
+    }
+
+    @Column(name="END_PILE_NO")
+    public String getEND_PILE_NO() {
+        return END_PILE_NO;
+    }
+
+    public void setEND_PILE_NO(String END_PILE_NO) {
+        this.END_PILE_NO = END_PILE_NO;
+    }
+
+    @Column(name="BUILD_CABIN")
+    public String getBUILD_CABIN() {
+        return BUILD_CABIN;
+    }
+
+    public void setBUILD_CABIN(String BUILD_CABIN) {
+        this.BUILD_CABIN = BUILD_CABIN;
+    }
+
+    @Column(name="MILEAGE")
+    public String getMILEAGE() {
+        return MILEAGE;
+    }
+
+    public void setMILEAGE(String MILEAGE) {
+        this.MILEAGE = MILEAGE;
+    }
+
+    @Column(name="FREQUENCY_TIME")
+    public String getFREQUENCY_TIME() {
+        return FREQUENCY_TIME;
+    }
+
+    public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+        this.FREQUENCY_TIME = FREQUENCY_TIME;
+    }
+
+    @Column(name="FREQUENCYTIME_END")
+    public String getFREQUENCYTIME_END() {
+        return FREQUENCYTIME_END;
+    }
+
+    public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+        this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+    }
+
+    @Column(name="KETTLE_TS")
+    public String getKETTLE_TS() {
+        return KETTLE_TS;
+    }
+
+    public void setKETTLE_TS(String KETTLE_TS) {
+        this.KETTLE_TS = KETTLE_TS;
+    }
+
+    @Column(name="UPDATEDATE")
+    public String getUPDATEDATE() {
+        return UPDATEDATE;
+    }
+
+    public void setUPDATEDATE(String UPDATEDATE) {
+        this.UPDATEDATE = UPDATEDATE;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 5346b57..2f8d359 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -66,7 +66,7 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REPAIRMAN")
+    @Column(name="REOAIRMAN")
     public String getRepairMan() {
         return repairMan;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
-    private Long id;
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-
-
-    public static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
-        PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
-        pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
-        pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
-        pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
-        pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
-        pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
-        pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
-        pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
-        pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
-        pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
-        pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
-        pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
-        pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
-        pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
-        pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
-        return pgAssetInSpectionRecordDto;
-    }
-
-
-    public static List<PgAssetInSpectionRecordDto> ConvertToDtoList(List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList){
-        List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-        for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
-            pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
-        }
-
-        return pgAssetInSpectionRecordDtoList;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
-    private String num;
-    private String createDate;
-
-    public String getNum() {
-        return num;
-    }
-
-    public void setNum(String num) {
-        this.num = num;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+    private Long id;
+    private String PLAN_NO;//巡检计划编号
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String FREQUENCY;//巡检频率
+    private String CREATOR;//创建人
+    private String DEVELOP_DEPT;//制定部门
+    private String PROJECT;//项目
+    private String STATE;//状态
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+        PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+        pgAssetPlanDto.setId(pgAssetPlan.getId());
+        pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+        pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+        pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+        pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+        pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+        pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+        pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+        pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+        pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+        pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+        pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+        return pgAssetPlanDto;
+    }
+
+    public static List<PgAssetPlanDto> ConvertToPgAssetDtoList(List<PgAssetPlan> pgAssetPlanList){
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
+
+        for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+            pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+        }
+
+        return pgAssetPlanDtoList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
new file mode 100644
index 0000000..bc12db1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
@@ -0,0 +1,24 @@
+package com.casic.PgInterface.maintenance.dto;
+
+public class PgAssetPlanStatic {
+
+    private String num;
+    private String createDate;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
deleted file mode 100644
index c41ca7d..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.casic.PgInterface.maintenance.manager;
-
-import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
-
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
-        try {
-            String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
-                    "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
-                    "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-
-            if(patrolMan!=null)
-                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
-            if(startTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
-            if(endTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')<to_date('"+endTime+"','yyyy-MM-dd')";
-
-            sql+=" order by id";
-
-            List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
-
-            List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList=new ArrayList<>();
-            for(Object[] objects1:objects){
-                PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord();
-
-                pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString()));
-                pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1]));
-                pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2]));
-                pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3]));
-                pgAssetInSpectionRecord.setState(String.valueOf(objects1[4]));
-                pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5]));
-                pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6]));
-                pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7]));
-                pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8]));
-                pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9]));
-                pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10]));
-                pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11]));
-                pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12]));
-                pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13]));
-                pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14]));
-                pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15]));
-                pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16]));
-                pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17]));
-                pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18]));
-                pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19]));
-
-                pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord);
-            }
-
-            List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-            for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList)
-            {
-                pgAssetInSpectionRecordDtoList.add(PgAssetInSpectionRecordDto.ConvertToDto(pgAssetInSpectionRecord));
-            }
-
-            return pgAssetInSpectionRecordDtoList;
-        }
-        catch(Exception e)
-        {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public List<PgAssetInSpectionRecordStatic> getPgAssetInSpectionRecordStaticLisByTime(
-            String startTime, String endTime, String staticType) {
-
-        String sql="";
-        String dateType="";
-        List<PgAssetInSpectionRecordStatic> pgAssetInSpectionRecordStaticList=new ArrayList<>();
-        int type=Integer.valueOf(staticType);
-
-        switch(type) {
-            case 0://年
-                dateType = "yyyy";
-                break;
-            case 1://月
-                dateType = "yyyy-mm";
-                break;
-            case 2://周
-                dateType = "iw";
-                break;
-            case 3://日
-                dateType="yyyy-mm-dd";
-                break;
-            default:
-                break;
-        }
-
-        sql="select count(*), to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_RECORD t where 1=1";
-
-        if(startTime!=null)
-            sql+=" and t.CREATE_DATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
-        if(endTime!=null)
-            sql+=" and t.CREATE_DATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
-
-        sql+=" group by to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"')";
-
-        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
-        for(int i=0;i<objects.size();i++)
-        {
-            PgAssetInSpectionRecordStatic pgAssetInSpectionRecordStatic=new PgAssetInSpectionRecordStatic();
-            pgAssetInSpectionRecordStatic.setNum(objects.get(i)[0].toString());
-            pgAssetInSpectionRecordStatic.setCreateDate(objects.get(i)[1].toString());
-            pgAssetInSpectionRecordStaticList.add(pgAssetInSpectionRecordStatic);
-        }
-        return pgAssetInSpectionRecordStaticList;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
new file mode 100644
index 0000000..bb6bf1e
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
@@ -0,0 +1,81 @@
+package com.casic.PgInterface.maintenance.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgAssetPlanManager extends HibernateEntityDao<PgAssetPlan> {
+
+    public List<PgAssetPlanDto> getPgAssetPlanDtoList(String inSpectionPlace){
+        Criteria criteria=createCriteria(PgAssetPlan.class);
+
+        if(StringUtils.isNotBlank(inSpectionPlace))
+            criteria.add(Restrictions.like("INSPECTION_PRACE","%"+inSpectionPlace+"%"));
+        criteria.addOrder(Order.desc("id"));
+
+        List<PgAssetPlan> pgAssetPlanList=criteria.list();
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=PgAssetPlanDto.ConvertToPgAssetDtoList(pgAssetPlanList);
+
+        if(pgAssetPlanDtoList==null||pgAssetPlanDtoList.size()==0)
+            return null;
+        else
+            return pgAssetPlanDtoList;
+    }
+
+    public List<PgAssetPlanStatic> getPgAssetPlanStaticLisByTime(
+            String startTime, String endTime, String staticType) {
+
+        String sql="";
+        String dateType="";
+        List<PgAssetPlanStatic> pgAssetPlanStaticList=new ArrayList<>();
+        int type=Integer.valueOf(staticType);
+
+        switch(type) {
+            case 0://年
+                dateType = "yyyy";
+                break;
+            case 1://月
+                dateType = "yyyy-mm";
+                break;
+            case 2://周
+                dateType = "iw";
+                break;
+            case 3://日
+                dateType="yyyy-mm-dd";
+                break;
+            default:
+                break;
+        }
+
+        sql="select count(*), to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_PLAN t where 1=1";
+
+        if(startTime!=null)
+            sql+=" and t.CREATEDATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
+        if(endTime!=null)
+            sql+=" and t.CREATEDATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
+
+        sql+=" group by to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"')";
+
+        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
+        for(int i=0;i<objects.size();i++)
+        {
+            PgAssetPlanStatic pgAssetPlanStatic=new PgAssetPlanStatic();
+            pgAssetPlanStatic.setNum(objects.get(i)[0].toString());
+            pgAssetPlanStatic.setCreateDate(objects.get(i)[1].toString());
+            pgAssetPlanStaticList.add(pgAssetPlanStatic);
+        }
+        return pgAssetPlanStaticList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 0903f22..3484739 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -15,7 +15,7 @@
 
     public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
             if(repairMan!=null)
                 sql+=" and REPAIRMAN like '%"+repairMan+"%'";
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index 9cc2881..6d90d7b 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -1,5 +1,7 @@
 package com.casic.PgInterface.patroler.dto;
 
+import com.casic.PgInterface.devTable.domain.PgDevice;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 
 /**
@@ -14,6 +16,7 @@
     private String unit;//单位
     private String alarmType;//报警类型
     private Long pgDeviceId;//设备编号
+    private String assetCode;//资产编号
 
     public Long getId() {
         return id;
@@ -71,7 +74,15 @@
         this.pgDeviceId = pgDeviceId;
     }
 
-    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
+    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule, PgDeviceManager pgDeviceManager) {
         this.setId(pgAlarmRule.getId());
         this.setHighValue(pgAlarmRule.getHighValue());
         this.setLowValue(pgAlarmRule.getLowValue());
@@ -82,6 +93,10 @@
         else
             this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
         this.setPgDeviceId(pgAlarmRule.getPgDeviceId());
+        if(pgAlarmRule.getAlarmTypeId()!=null&&pgDeviceManager.get(pgAlarmRule.getPgDeviceId())!=null)
+            this.setAssetCode(pgDeviceManager.get(pgAlarmRule.getPgDeviceId()).getAssetCode());
+        else
+            this.setAssetCode("");
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
index c132c98..a7cef5b 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
@@ -1,13 +1,17 @@
 package com.casic.PgInterface.patroler.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.ResponseStatus;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -17,30 +21,23 @@
 @Service
 public class PgAlarmRuleManager extends HibernateEntityDao<PgAlarmRule> {
 
+    @Resource
+    private PgDeviceManager pgDeviceManager;
+
     //根据设备获取设备报警阈值
-    public List<PgAlarmRuleDto>  getAlarmRuleDto() {
+    public List<PgAlarmRuleDto>  getAlarmRuleDto(String devType) {
         Criteria criteria=createCriteria(PgAlarmRule.class);
+
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.eq("devType", devType));
         criteria.addOrder(Order.desc("id"));
 
         List<PgAlarmRule> pgAlarmRuleList=criteria.list();
-        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
+        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         for (PgAlarmRule pgAlarmRule : pgAlarmRuleList) {
-            pgAlarmRuleDtoList.add(new PgAlarmRuleDto(pgAlarmRule));
+            pgAlarmRuleDtoList.add(new PgAlarmRuleDto(pgAlarmRule,pgDeviceManager));
         }
         return pgAlarmRuleDtoList;
-
     }
 
-    public PgAlarmRule getAlarmRuleBydevType(String devType) {
-        Criteria criteria=createCriteria(PgAlarmRule.class);
-        criteria.add(Restrictions.eq("devType", devType));
-
-        List<PgAlarmRule> pgAlarmRuleList=criteria.list();
-
-        if(pgAlarmRuleList==null||pgAlarmRuleList.size()==0)
-            return null;
-        else
-            return pgAlarmRuleList.get(0);
-    }
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index d0e28f5..082ba5d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgAlarm;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
@@ -39,7 +40,7 @@
     private PgReservePlanManager pgReservePlanManager;
 
     /*
-    * 获取报警设备信息
+     * 获取报警设备信息
      */
     @POST
     @Path("linkDevice")
@@ -50,11 +51,22 @@
 
         PgDeviceDto pgDeviceDto = null;
         try {
-            PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
-            PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
-
-            pgDeviceDto=new PgDeviceDto(pgDevice);
-            msg = "报警关联设备获取成功";
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if (pgAlarm == null)
+                    msg = "不存在报警信息";
+                else {
+                    PgDevice pgDevice = pgAlarm.getAlarmDevId();
+                    if (pgDevice == null)
+                        msg = "不存在报警设备";
+                    else {
+                        pgDeviceDto = new PgDeviceDto(pgDevice);
+                        msg = "报警关联设备获取成功";
+                    }
+                }
+            }
+            else
+                msg="未接受到报警设备ID信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取关联设备失败";
@@ -77,11 +89,28 @@
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
-            PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
-            PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
-            pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if(pgAlarm==null)
+                    msg="不存在报警信息";
+                else {
+                    PgDevice pgDevice = pgAlarm.getAlarmDevId();
+                    if (pgDevice == null)
+                        msg = "不存在报警设备";
+                    else {
+                        String strPosition=pgDevice.getPosition();
+                        String position="";
+                        if(!strPosition.equals(""))
+                            position=pgDevice.getPosition().substring(0,3);
+                        String partition=pgDevice.getPartition();
 
-            msg = "关联设备获取成功";
+                        pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
+                        msg = "关联设备获取成功";
+                    }
+                }
+            }
+            else
+                msg="请输入报警设备Id信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "分区设备关联失败";
@@ -93,7 +122,7 @@
 
     /*
      * 根据报警记录获取关联的预案
-    */
+     */
     @POST
     @Path("linkReservePlan")
     @Produces(MediaType.APPLICATION_JSON)
@@ -103,10 +132,21 @@
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
-            PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
-            pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if (pgAlarm == null)
+                    msg = "不存在报警信息";
+                else {
+                    pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-            msg="关联预案获取成功";
+                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
+                        msg="不存在关联的报警预案";
+                    else
+                        msg = "关联预案获取成功";
+                }
+            }
+            else
+                msg="请输入报警信息";
         }
         catch(Exception e)
         {

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ff69e2a..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,27 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190828.docx" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -32,72 +42,119 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="2" />
-          <entry key="java" value="243" />
-          <entry key="properties" value="6" />
+          <entry key="java" value="321" />
+          <entry key="properties" value="8" />
           <entry key="xml" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
-          <entry key="JAVA" value="243" />
-          <entry key="Properties" value="6" />
+          <entry key="JAVA" value="321" />
+          <entry key="Properties" value="8" />
           <entry key="XML" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="8082" />
-          <entry key="properties" value="49" />
-          <entry key="txt" value="64" />
+          <entry key="dummy" value="16" />
+          <entry key="java" value="10723" />
+          <entry key="properties" value="59" />
+          <entry key="txt" value="118" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="8082" />
-          <entry key="PLAIN_TEXT" value="64" />
-          <entry key="Properties" value="49" />
+          <entry key="JAVA" value="10723" />
+          <entry key="PLAIN_TEXT" value="134" />
+          <entry key="Properties" value="59" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="4" />
+          <entry key="project.closed" value="28" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
           <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.24" value="1" />
+          <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="1" />
-          <entry key="project.open.time.3" value="3" />
-          <entry key="project.open.time.31" value="1" />
+          <entry key="project.open.time.28" value="1" />
+          <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.31" value="2" />
           <entry key="project.open.time.37" value="1" />
+          <entry key="project.open.time.39" value="2" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.40" value="1" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="1" />
+          <entry key="project.open.time.44" value="2" />
           <entry key="project.open.time.45" value="2" />
           <entry key="project.open.time.48" value="1" />
           <entry key="project.open.time.49" value="1" />
+          <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.58" value="1" />
           <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.71" value="1" />
+          <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.71" value="2" />
           <entry key="project.open.time.76" value="1" />
-          <entry key="project.opened" value="25" />
+          <entry key="project.opened" value="41" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+            <state relative-caret-position="174">
+              <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
               <folding>
-                <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-                <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="352">
+              <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#787#788#0" expanded="true" />
+                <element signature="e#817#818#0" expanded="true" />
+                <element signature="e#2105#2106#0" expanded="true" />
+                <element signature="e#2135#2136#0" expanded="true" />
+                <element signature="e#2431#2432#0" expanded="true" />
+                <element signature="e#2461#2462#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="638">
+              <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+              <folding>
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -122,6 +179,7 @@
       <find>getPgDeviceByDevType</find>
       <find>message</find>
       <find>getConstructionByType</find>
+      <find>getPgCameraListByPosition</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -130,24 +188,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanTypeDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
@@ -162,17 +207,38 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
       </list>
     </option>
   </component>
@@ -208,16 +274,18 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="3" />
-    <option name="y" value="10" />
-    <option name="width" value="1386" />
-    <option name="height" value="788" />
+    <option name="x" value="1410" />
+    <option name="y" value="117" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -258,7 +326,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -267,16 +335,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -286,7 +345,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="dto" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -296,7 +355,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="manager" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -308,19 +367,10 @@
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="webapp" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -359,6 +409,7 @@
       </deployment>
       <server-settings>
         <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_7" />
+        <option name="JNDI_PORT" value="10991" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -456,7 +507,23 @@
       <workItem from="1566350810712" duration="6803000" />
       <workItem from="1566435787074" duration="10717000" />
       <workItem from="1566521753529" duration="14265000" />
-      <workItem from="1566614176989" duration="5693000" />
+      <workItem from="1566614176989" duration="14059000" />
+      <workItem from="1566780822009" duration="1026000" />
+      <workItem from="1566891563975" duration="284000" />
+      <workItem from="1566893107340" duration="3382000" />
+      <workItem from="1566953794976" duration="11039000" />
+      <workItem from="1567059357700" duration="484000" />
+      <workItem from="1567082835097" duration="1086000" />
+      <workItem from="1567126428020" duration="1539000" />
+      <workItem from="1567129277820" duration="5788000" />
+      <workItem from="1567136008996" duration="2568000" />
+      <workItem from="1567237040302" duration="111000" />
+      <workItem from="1567495626345" duration="2797000" />
+      <workItem from="1567558770152" duration="2352000" />
+      <workItem from="1567577368149" duration="640000" />
+      <workItem from="1567751224608" duration="780000" />
+      <workItem from="1568019299799" duration="695000" />
+      <workItem from="1568082566133" duration="4016000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -493,17 +560,60 @@
       <option name="project" value="LOCAL" />
       <updated>1566553388171</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="整理管线部分">
+      <created>1566620046627</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1566620046627</updated>
+    </task>
+    <task id="LOCAL-00007" summary="合并代码提交">
+      <created>1566781001910</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1566781001910</updated>
+    </task>
+    <task id="LOCAL-00008" summary="合并代码提交">
+      <created>1566963831930</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1566963831930</updated>
+    </task>
+    <task id="LOCAL-00009" summary="修改报警阈值">
+      <created>1566972146710</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1566972146710</updated>
+    </task>
+    <task id="LOCAL-00010" summary="修改巡检维护表字段">
+      <created>1567126525554</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1567126525554</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="142930000" />
+    <option name="totallyTimeSpent" value="189883000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
+    <frame x="1358" y="-8" width="1456" height="916" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29297996" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -511,13 +621,14 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Thumbnails" weight="0.3295082" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.5081967" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.3849105" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
       <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
       <window_info anchor="bottom" id="Spring" order="8" />
       <window_info anchor="bottom" id="Terminal" order="9" />
@@ -539,7 +650,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2193646" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -547,22 +658,23 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.47540984" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
-      <window_info anchor="bottom" id="Spring" order="8" />
-      <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
-      <window_info anchor="bottom" id="Statistic" order="11" />
-      <window_info anchor="bottom" id="Java Enterprise" order="12" />
-      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="14" weight="0.32786885" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.52307695" />
+      <window_info anchor="bottom" id="Thumbnails" order="0" weight="0.3295082" />
+      <window_info anchor="bottom" id="Message" order="1" />
+      <window_info anchor="bottom" id="Find" order="2" />
+      <window_info anchor="bottom" id="Run" order="3" />
+      <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.49924356" weight="0.49344262" />
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Application Servers" order="8" weight="0.3276923" />
+      <window_info anchor="bottom" id="Spring" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
+      <window_info anchor="bottom" id="Statistic" order="12" />
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <window_info anchor="bottom" id="Database Changes" order="14" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="15" weight="0.32786885" />
+      <window_info anchor="bottom" id="Messages" order="16" weight="0.5229508" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -578,6 +690,16 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -587,7 +709,11 @@
     <MESSAGE value="修改权限问题" />
     <MESSAGE value="修改人员登录返回接口" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整理管线部分" />
+    <MESSAGE value="合并代码提交" />
+    <MESSAGE value="修改报警阈值" />
+    <MESSAGE value="修改巡检维护表字段" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护表字段" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -602,322 +728,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-532">
-          <caret line="50" column="28" lean-forward="true" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="19" column="60" selection-start-line="19" selection-start-column="60" selection-end-line="19" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="100" column="34" lean-forward="true" selection-start-line="100" selection-start-column="34" selection-end-line="100" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1474">
-          <caret line="84" column="58" selection-start-line="84" selection-start-column="58" selection-end-line="84" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1100">
-          <caret line="58" column="18" selection-start-line="58" selection-start-column="18" selection-end-line="58" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6842">
-          <caret line="329" selection-start-line="329" selection-end-line="329" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="102" column="24" lean-forward="true" selection-start-line="102" selection-start-column="24" selection-end-line="102" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="72" column="56" lean-forward="true" selection-start-line="72" selection-start-column="56" selection-end-line="72" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="90" column="39" lean-forward="true" selection-start-line="90" selection-start-column="39" selection-end-line="90" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="97" column="16" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
-          <caret line="14" column="52" lean-forward="true" selection-start-line="14" selection-start-column="52" selection-end-line="14" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="26" column="34" lean-forward="true" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="61" column="1" lean-forward="true" selection-start-line="61" selection-start-column="1" selection-end-line="61" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="208" column="49" lean-forward="true" selection-start-line="208" selection-start-column="49" selection-end-line="208" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="140" column="57" selection-start-line="140" selection-start-column="57" selection-end-line="140" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="111" column="36" selection-start-line="111" selection-start-column="36" selection-end-line="111" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="3" lean-forward="true" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="81" column="58" lean-forward="true" selection-start-line="81" selection-start-column="58" selection-end-line="81" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="472">
-          <caret line="118" column="59" selection-start-line="118" selection-start-column="59" selection-end-line="118" selection-end-column="59" />
-          <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-198">
-          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="69" column="32" lean-forward="true" selection-start-line="69" selection-start-column="32" selection-end-line="70" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="142" column="59" lean-forward="true" selection-start-line="142" selection-start-column="59" selection-end-line="142" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="349" column="9" lean-forward="true" selection-start-line="349" selection-start-column="9" selection-end-line="349" selection-end-column="9" />
-          <folding>
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="e#12105#12121#0" expanded="true" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-686">
-          <caret line="67" column="31" lean-forward="true" selection-start-line="67" selection-start-column="31" selection-end-line="67" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="93" column="24" lean-forward="true" selection-start-line="93" selection-start-column="24" selection-end-line="93" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="57" column="23" lean-forward="true" selection-start-line="57" selection-start-column="23" selection-end-line="57" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-408">
-          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="98" column="40" lean-forward="true" selection-start-line="98" selection-start-column="40" selection-end-line="98" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="572">
@@ -925,13 +735,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="328" column="32" lean-forward="true" selection-start-line="328" selection-start-column="32" selection-end-line="328" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
@@ -950,16 +753,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="396">
           <caret line="23" column="32" lean-forward="true" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
-          <folding>
-            <element signature="e#2635#2636#0" expanded="true" />
-            <element signature="e#2671#2672#0" expanded="true" />
-            <element signature="e#2727#2728#0" expanded="true" />
-            <element signature="e#2777#2778#0" expanded="true" />
-            <element signature="e#2877#2878#0" expanded="true" />
-            <element signature="e#2911#2912#0" expanded="true" />
-            <element signature="e#2963#2964#0" expanded="true" />
-            <element signature="e#3009#3010#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -972,14 +765,481 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+        <state relative-caret-position="66">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="59" column="46" lean-forward="true" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3586">
+          <caret line="179" column="16" selection-start-line="179" selection-start-column="16" selection-end-line="179" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5478">
+          <caret line="273" column="3" selection-start-line="273" selection-start-column="3" selection-end-line="273" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1870">
+          <caret line="147" column="11" selection-start-line="147" selection-start-column="11" selection-end-line="147" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="55" column="15" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="106">
+          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="290" column="41" lean-forward="true" selection-start-line="290" selection-start-column="41" selection-end-line="290" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="21" column="32" lean-forward="true" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="550">
+          <caret line="38" column="89" selection-start-line="38" selection-start-column="89" selection-end-line="38" selection-end-column="89" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="11" column="28" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1166">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="818">
+          <caret line="285" column="13" lean-forward="true" selection-start-line="285" selection-start-column="13" selection-end-line="285" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="129" column="31" lean-forward="true" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="323" column="72" lean-forward="true" selection-start-line="323" selection-start-column="72" selection-end-line="323" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="44" column="13" lean-forward="true" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-638">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="244">
+          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="157">
+          <caret line="16" column="55" lean-forward="true" selection-start-line="16" selection-start-column="55" selection-end-line="16" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="270" column="33" lean-forward="true" selection-start-line="270" selection-start-column="33" selection-end-line="270" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="490">
+          <caret line="141" selection-start-line="141" selection-end-line="141" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="164" column="5" lean-forward="true" selection-start-line="164" selection-start-column="5" selection-end-line="164" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/apiTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-242">
+          <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="61" column="16" lean-forward="true" selection-start-line="61" selection-start-column="16" selection-end-line="61" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="700">
+          <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="12" column="34" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="39" column="9" lean-forward="true" selection-start-line="39" selection-start-column="9" selection-end-line="39" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="32" column="29" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="29" />
           <folding>
-            <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-            <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#1838#1839#0" expanded="true" />
+            <element signature="e#1863#1864#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1925#1926#0" expanded="true" />
+            <element signature="e#1822#1823#0" expanded="true" />
+            <element signature="e#1851#1852#0" expanded="true" />
+            <element signature="e#1895#1896#0" expanded="true" />
+            <element signature="e#1931#1932#0" expanded="true" />
+            <element signature="e#2132#2133#0" expanded="true" />
+            <element signature="e#2164#2165#0" expanded="true" />
+            <element signature="e#2214#2215#0" expanded="true" />
+            <element signature="e#2256#2257#0" expanded="true" />
+            <element signature="e#2330#2331#0" expanded="true" />
+            <element signature="e#2370#2371#0" expanded="true" />
+            <element signature="e#2436#2437#0" expanded="true" />
+            <element signature="e#2494#2495#0" expanded="true" />
+            <element signature="e#2569#2570#0" expanded="true" />
+            <element signature="e#2602#2603#0" expanded="true" />
+            <element signature="e#2654#2655#0" expanded="true" />
+            <element signature="e#2698#2699#0" expanded="true" />
+            <element signature="e#2764#2765#0" expanded="true" />
+            <element signature="e#2795#2796#0" expanded="true" />
+            <element signature="e#2843#2844#0" expanded="true" />
+            <element signature="e#2883#2884#0" expanded="true" />
+            <element signature="e#2948#2949#0" expanded="true" />
+            <element signature="e#2980#2981#0" expanded="true" />
+            <element signature="e#3030#3031#0" expanded="true" />
+            <element signature="e#3072#3073#0" expanded="true" />
+            <element signature="e#3134#3135#0" expanded="true" />
+            <element signature="e#3162#3163#0" expanded="true" />
+            <element signature="e#3204#3205#0" expanded="true" />
+            <element signature="e#3238#3239#0" expanded="true" />
+            <element signature="e#3307#3308#0" expanded="true" />
+            <element signature="e#3346#3347#0" expanded="true" />
+            <element signature="e#3410#3411#0" expanded="true" />
+            <element signature="e#3466#3467#0" expanded="true" />
+            <element signature="e#3537#3538#0" expanded="true" />
+            <element signature="e#3567#3568#0" expanded="true" />
+            <element signature="e#3613#3614#0" expanded="true" />
+            <element signature="e#3651#3652#0" expanded="true" />
+            <element signature="e#3721#3722#0" expanded="true" />
+            <element signature="e#3759#3760#0" expanded="true" />
+            <element signature="e#3821#3822#0" expanded="true" />
+            <element signature="e#3875#3876#0" expanded="true" />
+            <element signature="e#3953#3954#0" expanded="true" />
+            <element signature="e#3991#3992#0" expanded="true" />
+            <element signature="e#4053#4054#0" expanded="true" />
+            <element signature="e#4107#4108#0" expanded="true" />
+            <element signature="e#4186#4187#0" expanded="true" />
+            <element signature="e#4225#4226#0" expanded="true" />
+            <element signature="e#4289#4290#0" expanded="true" />
+            <element signature="e#4345#4346#0" expanded="true" />
+            <element signature="e#4430#4431#0" expanded="true" />
+            <element signature="e#4474#4475#0" expanded="true" />
+            <element signature="e#4698#4699#0" expanded="true" />
+            <element signature="e#4740#4741#0" expanded="true" />
+            <element signature="e#4810#4811#0" expanded="true" />
+            <element signature="e#4872#4873#0" expanded="true" />
+            <element signature="e#4955#4956#0" expanded="true" />
+            <element signature="e#4994#4995#0" expanded="true" />
+            <element signature="e#5058#5059#0" expanded="true" />
+            <element signature="e#5114#5115#0" expanded="true" />
+            <element signature="e#5194#5195#0" expanded="true" />
+            <element signature="e#5233#5234#0" expanded="true" />
+            <element signature="e#5297#5298#0" expanded="true" />
+            <element signature="e#5353#5354#0" expanded="true" />
+            <element signature="e#5428#5429#0" expanded="true" />
+            <element signature="e#5462#5463#0" expanded="true" />
+            <element signature="e#5516#5517#0" expanded="true" />
+            <element signature="e#5562#5563#0" expanded="true" />
+            <element signature="e#5634#5635#0" expanded="true" />
+            <element signature="e#5670#5671#0" expanded="true" />
+            <element signature="e#5728#5729#0" expanded="true" />
+            <element signature="e#5778#5779#0" expanded="true" />
+            <element signature="e#5852#5853#0" expanded="true" />
+            <element signature="e#5888#5889#0" expanded="true" />
+            <element signature="e#5946#5947#0" expanded="true" />
+            <element signature="e#5996#5997#0" expanded="true" />
+            <element signature="e#6067#6068#0" expanded="true" />
+            <element signature="e#6100#6101#0" expanded="true" />
+            <element signature="e#6152#6153#0" expanded="true" />
+            <element signature="e#6196#6197#0" expanded="true" />
+            <element signature="e#6261#6262#0" expanded="true" />
+            <element signature="e#6291#6292#0" expanded="true" />
+            <element signature="e#6337#6338#0" expanded="true" />
+            <element signature="e#6375#6376#0" expanded="true" />
+            <element signature="e#6437#6438#0" expanded="true" />
+            <element signature="e#6467#6468#0" expanded="true" />
+            <element signature="e#6513#6514#0" expanded="true" />
+            <element signature="e#6551#6552#0" expanded="true" />
+            <element signature="e#6613#6614#0" expanded="true" />
+            <element signature="e#6643#6644#0" expanded="true" />
+            <element signature="e#6689#6690#0" expanded="true" />
+            <element signature="e#6727#6728#0" expanded="true" />
+            <element signature="e#6796#6797#0" expanded="true" />
+            <element signature="e#6829#6830#0" expanded="true" />
+            <element signature="e#6881#6882#0" expanded="true" />
+            <element signature="e#6925#6926#0" expanded="true" />
+            <element signature="e#6995#6996#0" expanded="true" />
+            <element signature="e#7030#7031#0" expanded="true" />
+            <element signature="e#7086#7087#0" expanded="true" />
+            <element signature="e#7134#7135#0" expanded="true" />
+            <element signature="e#7202#7203#0" expanded="true" />
+            <element signature="e#7233#7234#0" expanded="true" />
+            <element signature="e#7281#7282#0" expanded="true" />
+            <element signature="e#7321#7322#0" expanded="true" />
+            <element signature="e#7390#7391#0" expanded="true" />
+            <element signature="e#7426#7427#0" expanded="true" />
+            <element signature="e#7484#7485#0" expanded="true" />
+            <element signature="e#7534#7535#0" expanded="true" />
+            <element signature="e#7602#7603#0" expanded="true" />
+            <element signature="e#7636#7637#0" expanded="true" />
+            <element signature="e#7690#7691#0" expanded="true" />
+            <element signature="e#7736#7737#0" expanded="true" />
+            <element signature="e#7806#7807#0" expanded="true" />
+            <element signature="e#7840#7841#0" expanded="true" />
+            <element signature="e#7894#7895#0" expanded="true" />
+            <element signature="e#7940#7941#0" expanded="true" />
+            <element signature="e#8006#8007#0" expanded="true" />
+            <element signature="e#8036#8037#0" expanded="true" />
+            <element signature="e#8082#8083#0" expanded="true" />
+            <element signature="e#8120#8121#0" expanded="true" />
+            <element signature="e#8189#8190#0" expanded="true" />
+            <element signature="e#8226#8227#0" expanded="true" />
+            <element signature="e#8286#8287#0" expanded="true" />
+            <element signature="e#8338#8339#0" expanded="true" />
+            <element signature="e#8417#8418#0" expanded="true" />
+            <element signature="e#8457#8458#0" expanded="true" />
+            <element signature="e#8523#8524#0" expanded="true" />
+            <element signature="e#8581#8582#0" expanded="true" />
+            <element signature="e#8655#8656#0" expanded="true" />
+            <element signature="e#8687#8688#0" expanded="true" />
+            <element signature="e#8737#8738#0" expanded="true" />
+            <element signature="e#8779#8780#0" expanded="true" />
+            <element signature="e#8846#8847#0" expanded="true" />
+            <element signature="e#8879#8880#0" expanded="true" />
+            <element signature="e#8931#8932#0" expanded="true" />
+            <element signature="e#8975#8976#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#787#788#0" expanded="true" />
+            <element signature="e#817#818#0" expanded="true" />
+            <element signature="e#2105#2106#0" expanded="true" />
+            <element signature="e#2135#2136#0" expanded="true" />
+            <element signature="e#2431#2432#0" expanded="true" />
+            <element signature="e#2461#2462#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index 854f1f1..0db633a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -165,12 +165,16 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String startDay,String endDay) {
+    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew) {
         try {
 
             Criteria criteria = createCriteria(PgAlarm.class);
             criteria.addOrder(Order.desc("id"));
 
+            if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) {
+                criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
+            }
+
             if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay))
             {
                 criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay)));
@@ -193,9 +197,11 @@
 
                 criteria.add(Restrictions.le("alarmDate",date));
             }
+            if(StringUtils.isNotBlank(isNew)&&isNew.equals("true"))
+                criteria.add(Restrictions.eq("active", 1));
 
             List<PgAlarm> pgAlarmList = criteria.list();
-            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
     }
 
     //根据设备位置(仓位)获取摄像机列表
-    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+    public List<PgDeviceDto> getPgCameraListByPosition(String partition,String position){
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.like("position",position+"%"));
-//        criteria.add(Restrictions.eq("devType","球机"));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(position))
+            criteria.add(Restrictions.like("position",position+"%"));
+
         criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
 
         List<PgDevice> pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
             dto.setDevCode(objects[5].toString());
             dto.setDevType(objects[6].toString());
             if(objects[7]!=null)
-            dto.setIp(objects[7].toString());
+                dto.setIp(objects[7].toString());
             dto.setIsOpen(objects[8].toString());
             dto.setPartition(objects[11].toString());
             dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index 8ebf74d..3c657a7 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgEquipment;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
 import com.casic.PgInterface.devTable.dto.PgEquipmentDto;
@@ -34,9 +35,12 @@
     public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
-        criteria.add(Restrictions.eq("eqName",eqName));
-        criteria.add(Restrictions.eq("eqCode",eqCode));
-        criteria.add(Restrictions.eq("eqType",eqType));
+        if(StringUtils.isNotBlank(eqName))
+            criteria.add(Restrictions.eq("eqName",eqName));
+        if(StringUtils.isNotBlank(eqCode))
+            criteria.add(Restrictions.eq("eqCode",eqCode));
+        if(StringUtils.isNotBlank(eqType))
+            criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
@@ -51,10 +55,9 @@
 
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
-        //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
         String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
-        +eqType+"' group by equipment.EQ_NAME";
+                +eqType+"' group by equipment.EQ_NAME";
 
         List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4ed68e4..e413a5c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
@@ -39,7 +40,8 @@
 
     public List<PgPipeLineDto> getPipeLineByLineType(String lineType) {
         Criteria criteria = createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineType", lineType));
+        if(StringUtils.isNotBlank(lineType))
+            criteria.add(Restrictions.eq("lineType", lineType));
 
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    private Long id;
-    private String keyId;//巡检记录单id
-    private String planId;//巡检计划ID
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    @Column(name="KEY_ID")
-    public String getKeyId() {
-        return keyId;
-    }
-
-    public void setKeyId(String keyId) {
-        this.keyId = keyId;
-    }
-
-    @Column(name="PLAN_ID")
-    public String getPlanId() {
-        return planId;
-    }
-
-    public void setPlanId(String planId) {
-        this.planId = planId;
-    }
-
-    @Column(name="CREATE_DATE")
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    @Column(name="STATE")
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    @Column(name="CREATOR")
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    @Column(name="PLAN_NAME")
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    @Column(name="RECORD_NO")
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    @Column(name="PLAN_NO")
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    @Column(name="RESPONSIBIE_DEPT")
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    @Column(name="INSPECTION_PERSON")
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    @Column(name="PATROL_MAN")
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    @Column(name="OPERATE_DATE")
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    @Column(name="REMARK")
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Column(name="BUILD_CABIN")
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    @Column(name="PROJECT")
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    @Column(name="START_PILE_NO")
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    @Column(name="END_PILE_NO")
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    @Column(name="INSPECTION_PRACE")
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    @Column(name="OTHER_PATROL_MAN")
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private Long id;
+    private String KEY_ID;//唯一键值
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_PERSON;//巡检人
+    private String START_DATE;//巡检开始时间
+    private String END_DATE;
+    private String FREQUENCY;//巡检频率
+    private String STATE;//状态
+    private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+    private String PLAN_NO;//巡检计划编号
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_MODE;//巡检方式
+    private String INSPECTION_ROUTE;//巡检路线
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String INSPECTION_GROUP;//巡检部门
+    private String INSERT_TIME;//插入时间
+    private String FREQUENCYDATE;//巡检具体日期
+    private String FREQUENCYTIME;//巡检具体时间
+    private String CREATEDATE;//创建时间
+    private String CREATOR;//创建人
+    private String PROJECT;//项目
+    private String COMLILE;//编制人
+    private String START_TIME;//编制时间
+    private String DEVELOP_DEPT;//制定部门
+    private String END_TIME;//结束时间
+    private String START_PILE_NO;//开始桩号
+    private String END_PILE_NO;//结束桩号
+    private String BUILD_CABIN;//巡检舱室
+    private String MILEAGE;
+    private String FREQUENCY_TIME;//巡检具体时间
+    private String FREQUENCYTIME_END;
+    private String KETTLE_TS;
+    private String UPDATEDATE;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="KEY_ID")
+    public String getKEY_ID() {
+        return KEY_ID;
+    }
+
+    public void setKEY_ID(String KEY_ID) {
+        this.KEY_ID = KEY_ID;
+    }
+
+    @Column(name="PLAN_NAME")
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    @Column(name="INSPECTION_PERSON")
+    public String getINSPECTION_PERSON() {
+        return INSPECTION_PERSON;
+    }
+
+    public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+        this.INSPECTION_PERSON = INSPECTION_PERSON;
+    }
+
+    @Column(name="START_DATE")
+    public String getSTART_DATE() {
+        return START_DATE;
+    }
+
+    public void setSTART_DATE(String START_DATE) {
+        this.START_DATE = START_DATE;
+    }
+
+    @Column(name="END_DATE")
+    public String getEND_DATE() {
+        return END_DATE;
+    }
+
+    public void setEND_DATE(String END_DATE) {
+        this.END_DATE = END_DATE;
+    }
+
+    @Column(name="FREQUENCY")
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    @Column(name="STATE")
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    @Column(name="RESPONSIBLE_DEPT")
+    public String getRESPONSIBLE_DEPT() {
+        return RESPONSIBLE_DEPT;
+    }
+
+    public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+        this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+    }
+
+    @Column(name="PLAN_NO")
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    @Column(name="INSPECTION_TYPE")
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    @Column(name="INSPECTION_MODE")
+    public String getINSPECTION_MODE() {
+        return INSPECTION_MODE;
+    }
+
+    public void setINSPECTION_MODE(String INSPECTION_MODE) {
+        this.INSPECTION_MODE = INSPECTION_MODE;
+    }
+
+    @Column(name="INSPECTION_ROUTE")
+    public String getINSPECTION_ROUTE() {
+        return INSPECTION_ROUTE;
+    }
+
+    public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+        this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+    }
+
+    @Column(name="INSPECTION_START_TIME")
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    @Column(name="INSPECTION_END_TIME")
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    @Column(name="INSPECTION_PRACE")
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    @Column(name="INSPECTION_GROUP")
+    public String getINSPECTION_GROUP() {
+        return INSPECTION_GROUP;
+    }
+
+    public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+        this.INSPECTION_GROUP = INSPECTION_GROUP;
+    }
+
+    @Column(name="INSERT_TIME")
+    public String getINSERT_TIME() {
+        return INSERT_TIME;
+    }
+
+    public void setINSERT_TIME(String INSERT_TIME) {
+        this.INSERT_TIME = INSERT_TIME;
+    }
+
+    @Column(name="FREQUENCYDATE")
+    public String getFREQUENCYDATE() {
+        return FREQUENCYDATE;
+    }
+
+    public void setFREQUENCYDATE(String FREQUENCYDATE) {
+        this.FREQUENCYDATE = FREQUENCYDATE;
+    }
+
+    @Column(name="FREQUENCYTIME")
+    public String getFREQUENCYTIME() {
+        return FREQUENCYTIME;
+    }
+
+    public void setFREQUENCYTIME(String FREQUENCYTIME) {
+        this.FREQUENCYTIME = FREQUENCYTIME;
+    }
+
+    @Column(name="CREATEDATE")
+    public String getCREATEDATE() {
+        return CREATEDATE;
+    }
+
+    public void setCREATEDATE(String CREATEDATE) {
+        this.CREATEDATE = CREATEDATE;
+    }
+
+    @Column(name="CREATOR")
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    @Column(name="PROJECT")
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    @Column(name="COMLILE")
+    public String getCOMLILE() {
+        return COMLILE;
+    }
+
+    public void setCOMLILE(String COMLILE) {
+        this.COMLILE = COMLILE;
+    }
+
+    @Column(name="START_TIME")
+    public String getSTART_TIME() {
+        return START_TIME;
+    }
+
+    public void setSTART_TIME(String START_TIME) {
+        this.START_TIME = START_TIME;
+    }
+
+    @Column(name="DEVELOP_DEPT")
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    @Column(name="END_TIME")
+    public String getEND_TIME() {
+        return END_TIME;
+    }
+
+    public void setEND_TIME(String END_TIME) {
+        this.END_TIME = END_TIME;
+    }
+
+    @Column(name="START_PILE_NO")
+    public String getSTART_PILE_NO() {
+        return START_PILE_NO;
+    }
+
+    public void setSTART_PILE_NO(String START_PILE_NO) {
+        this.START_PILE_NO = START_PILE_NO;
+    }
+
+    @Column(name="END_PILE_NO")
+    public String getEND_PILE_NO() {
+        return END_PILE_NO;
+    }
+
+    public void setEND_PILE_NO(String END_PILE_NO) {
+        this.END_PILE_NO = END_PILE_NO;
+    }
+
+    @Column(name="BUILD_CABIN")
+    public String getBUILD_CABIN() {
+        return BUILD_CABIN;
+    }
+
+    public void setBUILD_CABIN(String BUILD_CABIN) {
+        this.BUILD_CABIN = BUILD_CABIN;
+    }
+
+    @Column(name="MILEAGE")
+    public String getMILEAGE() {
+        return MILEAGE;
+    }
+
+    public void setMILEAGE(String MILEAGE) {
+        this.MILEAGE = MILEAGE;
+    }
+
+    @Column(name="FREQUENCY_TIME")
+    public String getFREQUENCY_TIME() {
+        return FREQUENCY_TIME;
+    }
+
+    public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+        this.FREQUENCY_TIME = FREQUENCY_TIME;
+    }
+
+    @Column(name="FREQUENCYTIME_END")
+    public String getFREQUENCYTIME_END() {
+        return FREQUENCYTIME_END;
+    }
+
+    public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+        this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+    }
+
+    @Column(name="KETTLE_TS")
+    public String getKETTLE_TS() {
+        return KETTLE_TS;
+    }
+
+    public void setKETTLE_TS(String KETTLE_TS) {
+        this.KETTLE_TS = KETTLE_TS;
+    }
+
+    @Column(name="UPDATEDATE")
+    public String getUPDATEDATE() {
+        return UPDATEDATE;
+    }
+
+    public void setUPDATEDATE(String UPDATEDATE) {
+        this.UPDATEDATE = UPDATEDATE;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 5346b57..2f8d359 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -66,7 +66,7 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REPAIRMAN")
+    @Column(name="REOAIRMAN")
     public String getRepairMan() {
         return repairMan;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
-    private Long id;
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-
-
-    public static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
-        PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
-        pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
-        pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
-        pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
-        pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
-        pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
-        pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
-        pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
-        pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
-        pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
-        pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
-        pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
-        pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
-        pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
-        pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
-        return pgAssetInSpectionRecordDto;
-    }
-
-
-    public static List<PgAssetInSpectionRecordDto> ConvertToDtoList(List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList){
-        List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-        for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
-            pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
-        }
-
-        return pgAssetInSpectionRecordDtoList;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
-    private String num;
-    private String createDate;
-
-    public String getNum() {
-        return num;
-    }
-
-    public void setNum(String num) {
-        this.num = num;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+    private Long id;
+    private String PLAN_NO;//巡检计划编号
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String FREQUENCY;//巡检频率
+    private String CREATOR;//创建人
+    private String DEVELOP_DEPT;//制定部门
+    private String PROJECT;//项目
+    private String STATE;//状态
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+        PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+        pgAssetPlanDto.setId(pgAssetPlan.getId());
+        pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+        pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+        pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+        pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+        pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+        pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+        pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+        pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+        pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+        pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+        pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+        return pgAssetPlanDto;
+    }
+
+    public static List<PgAssetPlanDto> ConvertToPgAssetDtoList(List<PgAssetPlan> pgAssetPlanList){
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
+
+        for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+            pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+        }
+
+        return pgAssetPlanDtoList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
new file mode 100644
index 0000000..bc12db1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
@@ -0,0 +1,24 @@
+package com.casic.PgInterface.maintenance.dto;
+
+public class PgAssetPlanStatic {
+
+    private String num;
+    private String createDate;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
deleted file mode 100644
index c41ca7d..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.casic.PgInterface.maintenance.manager;
-
-import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
-
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
-        try {
-            String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
-                    "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
-                    "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-
-            if(patrolMan!=null)
-                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
-            if(startTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
-            if(endTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')<to_date('"+endTime+"','yyyy-MM-dd')";
-
-            sql+=" order by id";
-
-            List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
-
-            List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList=new ArrayList<>();
-            for(Object[] objects1:objects){
-                PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord();
-
-                pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString()));
-                pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1]));
-                pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2]));
-                pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3]));
-                pgAssetInSpectionRecord.setState(String.valueOf(objects1[4]));
-                pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5]));
-                pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6]));
-                pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7]));
-                pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8]));
-                pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9]));
-                pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10]));
-                pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11]));
-                pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12]));
-                pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13]));
-                pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14]));
-                pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15]));
-                pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16]));
-                pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17]));
-                pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18]));
-                pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19]));
-
-                pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord);
-            }
-
-            List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-            for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList)
-            {
-                pgAssetInSpectionRecordDtoList.add(PgAssetInSpectionRecordDto.ConvertToDto(pgAssetInSpectionRecord));
-            }
-
-            return pgAssetInSpectionRecordDtoList;
-        }
-        catch(Exception e)
-        {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public List<PgAssetInSpectionRecordStatic> getPgAssetInSpectionRecordStaticLisByTime(
-            String startTime, String endTime, String staticType) {
-
-        String sql="";
-        String dateType="";
-        List<PgAssetInSpectionRecordStatic> pgAssetInSpectionRecordStaticList=new ArrayList<>();
-        int type=Integer.valueOf(staticType);
-
-        switch(type) {
-            case 0://年
-                dateType = "yyyy";
-                break;
-            case 1://月
-                dateType = "yyyy-mm";
-                break;
-            case 2://周
-                dateType = "iw";
-                break;
-            case 3://日
-                dateType="yyyy-mm-dd";
-                break;
-            default:
-                break;
-        }
-
-        sql="select count(*), to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_RECORD t where 1=1";
-
-        if(startTime!=null)
-            sql+=" and t.CREATE_DATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
-        if(endTime!=null)
-            sql+=" and t.CREATE_DATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
-
-        sql+=" group by to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"')";
-
-        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
-        for(int i=0;i<objects.size();i++)
-        {
-            PgAssetInSpectionRecordStatic pgAssetInSpectionRecordStatic=new PgAssetInSpectionRecordStatic();
-            pgAssetInSpectionRecordStatic.setNum(objects.get(i)[0].toString());
-            pgAssetInSpectionRecordStatic.setCreateDate(objects.get(i)[1].toString());
-            pgAssetInSpectionRecordStaticList.add(pgAssetInSpectionRecordStatic);
-        }
-        return pgAssetInSpectionRecordStaticList;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
new file mode 100644
index 0000000..bb6bf1e
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
@@ -0,0 +1,81 @@
+package com.casic.PgInterface.maintenance.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgAssetPlanManager extends HibernateEntityDao<PgAssetPlan> {
+
+    public List<PgAssetPlanDto> getPgAssetPlanDtoList(String inSpectionPlace){
+        Criteria criteria=createCriteria(PgAssetPlan.class);
+
+        if(StringUtils.isNotBlank(inSpectionPlace))
+            criteria.add(Restrictions.like("INSPECTION_PRACE","%"+inSpectionPlace+"%"));
+        criteria.addOrder(Order.desc("id"));
+
+        List<PgAssetPlan> pgAssetPlanList=criteria.list();
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=PgAssetPlanDto.ConvertToPgAssetDtoList(pgAssetPlanList);
+
+        if(pgAssetPlanDtoList==null||pgAssetPlanDtoList.size()==0)
+            return null;
+        else
+            return pgAssetPlanDtoList;
+    }
+
+    public List<PgAssetPlanStatic> getPgAssetPlanStaticLisByTime(
+            String startTime, String endTime, String staticType) {
+
+        String sql="";
+        String dateType="";
+        List<PgAssetPlanStatic> pgAssetPlanStaticList=new ArrayList<>();
+        int type=Integer.valueOf(staticType);
+
+        switch(type) {
+            case 0://年
+                dateType = "yyyy";
+                break;
+            case 1://月
+                dateType = "yyyy-mm";
+                break;
+            case 2://周
+                dateType = "iw";
+                break;
+            case 3://日
+                dateType="yyyy-mm-dd";
+                break;
+            default:
+                break;
+        }
+
+        sql="select count(*), to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_PLAN t where 1=1";
+
+        if(startTime!=null)
+            sql+=" and t.CREATEDATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
+        if(endTime!=null)
+            sql+=" and t.CREATEDATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
+
+        sql+=" group by to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"')";
+
+        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
+        for(int i=0;i<objects.size();i++)
+        {
+            PgAssetPlanStatic pgAssetPlanStatic=new PgAssetPlanStatic();
+            pgAssetPlanStatic.setNum(objects.get(i)[0].toString());
+            pgAssetPlanStatic.setCreateDate(objects.get(i)[1].toString());
+            pgAssetPlanStaticList.add(pgAssetPlanStatic);
+        }
+        return pgAssetPlanStaticList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 0903f22..3484739 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -15,7 +15,7 @@
 
     public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
             if(repairMan!=null)
                 sql+=" and REPAIRMAN like '%"+repairMan+"%'";
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index 9cc2881..6d90d7b 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -1,5 +1,7 @@
 package com.casic.PgInterface.patroler.dto;
 
+import com.casic.PgInterface.devTable.domain.PgDevice;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 
 /**
@@ -14,6 +16,7 @@
     private String unit;//单位
     private String alarmType;//报警类型
     private Long pgDeviceId;//设备编号
+    private String assetCode;//资产编号
 
     public Long getId() {
         return id;
@@ -71,7 +74,15 @@
         this.pgDeviceId = pgDeviceId;
     }
 
-    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
+    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule, PgDeviceManager pgDeviceManager) {
         this.setId(pgAlarmRule.getId());
         this.setHighValue(pgAlarmRule.getHighValue());
         this.setLowValue(pgAlarmRule.getLowValue());
@@ -82,6 +93,10 @@
         else
             this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
         this.setPgDeviceId(pgAlarmRule.getPgDeviceId());
+        if(pgAlarmRule.getAlarmTypeId()!=null&&pgDeviceManager.get(pgAlarmRule.getPgDeviceId())!=null)
+            this.setAssetCode(pgDeviceManager.get(pgAlarmRule.getPgDeviceId()).getAssetCode());
+        else
+            this.setAssetCode("");
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
index c132c98..a7cef5b 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
@@ -1,13 +1,17 @@
 package com.casic.PgInterface.patroler.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.ResponseStatus;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -17,30 +21,23 @@
 @Service
 public class PgAlarmRuleManager extends HibernateEntityDao<PgAlarmRule> {
 
+    @Resource
+    private PgDeviceManager pgDeviceManager;
+
     //根据设备获取设备报警阈值
-    public List<PgAlarmRuleDto>  getAlarmRuleDto() {
+    public List<PgAlarmRuleDto>  getAlarmRuleDto(String devType) {
         Criteria criteria=createCriteria(PgAlarmRule.class);
+
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.eq("devType", devType));
         criteria.addOrder(Order.desc("id"));
 
         List<PgAlarmRule> pgAlarmRuleList=criteria.list();
-        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
+        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         for (PgAlarmRule pgAlarmRule : pgAlarmRuleList) {
-            pgAlarmRuleDtoList.add(new PgAlarmRuleDto(pgAlarmRule));
+            pgAlarmRuleDtoList.add(new PgAlarmRuleDto(pgAlarmRule,pgDeviceManager));
         }
         return pgAlarmRuleDtoList;
-
     }
 
-    public PgAlarmRule getAlarmRuleBydevType(String devType) {
-        Criteria criteria=createCriteria(PgAlarmRule.class);
-        criteria.add(Restrictions.eq("devType", devType));
-
-        List<PgAlarmRule> pgAlarmRuleList=criteria.list();
-
-        if(pgAlarmRuleList==null||pgAlarmRuleList.size()==0)
-            return null;
-        else
-            return pgAlarmRuleList.get(0);
-    }
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index d0e28f5..082ba5d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgAlarm;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
@@ -39,7 +40,7 @@
     private PgReservePlanManager pgReservePlanManager;
 
     /*
-    * 获取报警设备信息
+     * 获取报警设备信息
      */
     @POST
     @Path("linkDevice")
@@ -50,11 +51,22 @@
 
         PgDeviceDto pgDeviceDto = null;
         try {
-            PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
-            PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
-
-            pgDeviceDto=new PgDeviceDto(pgDevice);
-            msg = "报警关联设备获取成功";
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if (pgAlarm == null)
+                    msg = "不存在报警信息";
+                else {
+                    PgDevice pgDevice = pgAlarm.getAlarmDevId();
+                    if (pgDevice == null)
+                        msg = "不存在报警设备";
+                    else {
+                        pgDeviceDto = new PgDeviceDto(pgDevice);
+                        msg = "报警关联设备获取成功";
+                    }
+                }
+            }
+            else
+                msg="未接受到报警设备ID信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取关联设备失败";
@@ -77,11 +89,28 @@
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
-            PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
-            PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
-            pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if(pgAlarm==null)
+                    msg="不存在报警信息";
+                else {
+                    PgDevice pgDevice = pgAlarm.getAlarmDevId();
+                    if (pgDevice == null)
+                        msg = "不存在报警设备";
+                    else {
+                        String strPosition=pgDevice.getPosition();
+                        String position="";
+                        if(!strPosition.equals(""))
+                            position=pgDevice.getPosition().substring(0,3);
+                        String partition=pgDevice.getPartition();
 
-            msg = "关联设备获取成功";
+                        pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
+                        msg = "关联设备获取成功";
+                    }
+                }
+            }
+            else
+                msg="请输入报警设备Id信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "分区设备关联失败";
@@ -93,7 +122,7 @@
 
     /*
      * 根据报警记录获取关联的预案
-    */
+     */
     @POST
     @Path("linkReservePlan")
     @Produces(MediaType.APPLICATION_JSON)
@@ -103,10 +132,21 @@
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
-            PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
-            pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if (pgAlarm == null)
+                    msg = "不存在报警信息";
+                else {
+                    pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-            msg="关联预案获取成功";
+                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
+                        msg="不存在关联的报警预案";
+                    else
+                        msg = "关联预案获取成功";
+                }
+            }
+            else
+                msg="请输入报警信息";
         }
         catch(Exception e)
         {
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index d18ebb8..baacd93 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -48,14 +48,16 @@
     @POST
     @Path("getAlarmInfo")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmList(@FormParam("startDay") String startDay,
-                                            @FormParam("endDay") String endDay) throws Exception {
+    public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
+                                            @FormParam("startDay") String startDay,
+                                            @FormParam("endDay") String endDay,
+                                            @FormParam("isNew") String isNew) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(startDay,endDay);
-            if (pgAlarmDtoList.size() == 0)
+            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew);
+            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
                 msg = "没有报警信息";
             else
                 msg = "报警信息获取成功";

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ff69e2a..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,27 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190828.docx" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -32,72 +42,119 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="2" />
-          <entry key="java" value="243" />
-          <entry key="properties" value="6" />
+          <entry key="java" value="321" />
+          <entry key="properties" value="8" />
           <entry key="xml" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
-          <entry key="JAVA" value="243" />
-          <entry key="Properties" value="6" />
+          <entry key="JAVA" value="321" />
+          <entry key="Properties" value="8" />
           <entry key="XML" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="8082" />
-          <entry key="properties" value="49" />
-          <entry key="txt" value="64" />
+          <entry key="dummy" value="16" />
+          <entry key="java" value="10723" />
+          <entry key="properties" value="59" />
+          <entry key="txt" value="118" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="8082" />
-          <entry key="PLAIN_TEXT" value="64" />
-          <entry key="Properties" value="49" />
+          <entry key="JAVA" value="10723" />
+          <entry key="PLAIN_TEXT" value="134" />
+          <entry key="Properties" value="59" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="4" />
+          <entry key="project.closed" value="28" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
           <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.24" value="1" />
+          <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="1" />
-          <entry key="project.open.time.3" value="3" />
-          <entry key="project.open.time.31" value="1" />
+          <entry key="project.open.time.28" value="1" />
+          <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.31" value="2" />
           <entry key="project.open.time.37" value="1" />
+          <entry key="project.open.time.39" value="2" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.40" value="1" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="1" />
+          <entry key="project.open.time.44" value="2" />
           <entry key="project.open.time.45" value="2" />
           <entry key="project.open.time.48" value="1" />
           <entry key="project.open.time.49" value="1" />
+          <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.58" value="1" />
           <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.71" value="1" />
+          <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.71" value="2" />
           <entry key="project.open.time.76" value="1" />
-          <entry key="project.opened" value="25" />
+          <entry key="project.opened" value="41" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+            <state relative-caret-position="174">
+              <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
               <folding>
-                <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-                <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="352">
+              <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#787#788#0" expanded="true" />
+                <element signature="e#817#818#0" expanded="true" />
+                <element signature="e#2105#2106#0" expanded="true" />
+                <element signature="e#2135#2136#0" expanded="true" />
+                <element signature="e#2431#2432#0" expanded="true" />
+                <element signature="e#2461#2462#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="638">
+              <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+              <folding>
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -122,6 +179,7 @@
       <find>getPgDeviceByDevType</find>
       <find>message</find>
       <find>getConstructionByType</find>
+      <find>getPgCameraListByPosition</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -130,24 +188,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanTypeDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
@@ -162,17 +207,38 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
       </list>
     </option>
   </component>
@@ -208,16 +274,18 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="3" />
-    <option name="y" value="10" />
-    <option name="width" value="1386" />
-    <option name="height" value="788" />
+    <option name="x" value="1410" />
+    <option name="y" value="117" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -258,7 +326,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -267,16 +335,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -286,7 +345,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="dto" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -296,7 +355,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="manager" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -308,19 +367,10 @@
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="webapp" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -359,6 +409,7 @@
       </deployment>
       <server-settings>
         <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_7" />
+        <option name="JNDI_PORT" value="10991" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -456,7 +507,23 @@
       <workItem from="1566350810712" duration="6803000" />
       <workItem from="1566435787074" duration="10717000" />
       <workItem from="1566521753529" duration="14265000" />
-      <workItem from="1566614176989" duration="5693000" />
+      <workItem from="1566614176989" duration="14059000" />
+      <workItem from="1566780822009" duration="1026000" />
+      <workItem from="1566891563975" duration="284000" />
+      <workItem from="1566893107340" duration="3382000" />
+      <workItem from="1566953794976" duration="11039000" />
+      <workItem from="1567059357700" duration="484000" />
+      <workItem from="1567082835097" duration="1086000" />
+      <workItem from="1567126428020" duration="1539000" />
+      <workItem from="1567129277820" duration="5788000" />
+      <workItem from="1567136008996" duration="2568000" />
+      <workItem from="1567237040302" duration="111000" />
+      <workItem from="1567495626345" duration="2797000" />
+      <workItem from="1567558770152" duration="2352000" />
+      <workItem from="1567577368149" duration="640000" />
+      <workItem from="1567751224608" duration="780000" />
+      <workItem from="1568019299799" duration="695000" />
+      <workItem from="1568082566133" duration="4016000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -493,17 +560,60 @@
       <option name="project" value="LOCAL" />
       <updated>1566553388171</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="整理管线部分">
+      <created>1566620046627</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1566620046627</updated>
+    </task>
+    <task id="LOCAL-00007" summary="合并代码提交">
+      <created>1566781001910</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1566781001910</updated>
+    </task>
+    <task id="LOCAL-00008" summary="合并代码提交">
+      <created>1566963831930</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1566963831930</updated>
+    </task>
+    <task id="LOCAL-00009" summary="修改报警阈值">
+      <created>1566972146710</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1566972146710</updated>
+    </task>
+    <task id="LOCAL-00010" summary="修改巡检维护表字段">
+      <created>1567126525554</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1567126525554</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="142930000" />
+    <option name="totallyTimeSpent" value="189883000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
+    <frame x="1358" y="-8" width="1456" height="916" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29297996" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -511,13 +621,14 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Thumbnails" weight="0.3295082" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.5081967" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.3849105" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
       <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
       <window_info anchor="bottom" id="Spring" order="8" />
       <window_info anchor="bottom" id="Terminal" order="9" />
@@ -539,7 +650,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2193646" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -547,22 +658,23 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.47540984" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
-      <window_info anchor="bottom" id="Spring" order="8" />
-      <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
-      <window_info anchor="bottom" id="Statistic" order="11" />
-      <window_info anchor="bottom" id="Java Enterprise" order="12" />
-      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="14" weight="0.32786885" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.52307695" />
+      <window_info anchor="bottom" id="Thumbnails" order="0" weight="0.3295082" />
+      <window_info anchor="bottom" id="Message" order="1" />
+      <window_info anchor="bottom" id="Find" order="2" />
+      <window_info anchor="bottom" id="Run" order="3" />
+      <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.49924356" weight="0.49344262" />
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Application Servers" order="8" weight="0.3276923" />
+      <window_info anchor="bottom" id="Spring" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
+      <window_info anchor="bottom" id="Statistic" order="12" />
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <window_info anchor="bottom" id="Database Changes" order="14" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="15" weight="0.32786885" />
+      <window_info anchor="bottom" id="Messages" order="16" weight="0.5229508" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -578,6 +690,16 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -587,7 +709,11 @@
     <MESSAGE value="修改权限问题" />
     <MESSAGE value="修改人员登录返回接口" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整理管线部分" />
+    <MESSAGE value="合并代码提交" />
+    <MESSAGE value="修改报警阈值" />
+    <MESSAGE value="修改巡检维护表字段" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护表字段" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -602,322 +728,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-532">
-          <caret line="50" column="28" lean-forward="true" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="19" column="60" selection-start-line="19" selection-start-column="60" selection-end-line="19" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="100" column="34" lean-forward="true" selection-start-line="100" selection-start-column="34" selection-end-line="100" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1474">
-          <caret line="84" column="58" selection-start-line="84" selection-start-column="58" selection-end-line="84" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1100">
-          <caret line="58" column="18" selection-start-line="58" selection-start-column="18" selection-end-line="58" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6842">
-          <caret line="329" selection-start-line="329" selection-end-line="329" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="102" column="24" lean-forward="true" selection-start-line="102" selection-start-column="24" selection-end-line="102" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="72" column="56" lean-forward="true" selection-start-line="72" selection-start-column="56" selection-end-line="72" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="90" column="39" lean-forward="true" selection-start-line="90" selection-start-column="39" selection-end-line="90" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="97" column="16" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
-          <caret line="14" column="52" lean-forward="true" selection-start-line="14" selection-start-column="52" selection-end-line="14" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="26" column="34" lean-forward="true" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="61" column="1" lean-forward="true" selection-start-line="61" selection-start-column="1" selection-end-line="61" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="208" column="49" lean-forward="true" selection-start-line="208" selection-start-column="49" selection-end-line="208" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="140" column="57" selection-start-line="140" selection-start-column="57" selection-end-line="140" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="111" column="36" selection-start-line="111" selection-start-column="36" selection-end-line="111" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="3" lean-forward="true" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="81" column="58" lean-forward="true" selection-start-line="81" selection-start-column="58" selection-end-line="81" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="472">
-          <caret line="118" column="59" selection-start-line="118" selection-start-column="59" selection-end-line="118" selection-end-column="59" />
-          <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-198">
-          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="69" column="32" lean-forward="true" selection-start-line="69" selection-start-column="32" selection-end-line="70" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="142" column="59" lean-forward="true" selection-start-line="142" selection-start-column="59" selection-end-line="142" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="349" column="9" lean-forward="true" selection-start-line="349" selection-start-column="9" selection-end-line="349" selection-end-column="9" />
-          <folding>
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="e#12105#12121#0" expanded="true" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-686">
-          <caret line="67" column="31" lean-forward="true" selection-start-line="67" selection-start-column="31" selection-end-line="67" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="93" column="24" lean-forward="true" selection-start-line="93" selection-start-column="24" selection-end-line="93" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="57" column="23" lean-forward="true" selection-start-line="57" selection-start-column="23" selection-end-line="57" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-408">
-          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="98" column="40" lean-forward="true" selection-start-line="98" selection-start-column="40" selection-end-line="98" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="572">
@@ -925,13 +735,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="328" column="32" lean-forward="true" selection-start-line="328" selection-start-column="32" selection-end-line="328" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
@@ -950,16 +753,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="396">
           <caret line="23" column="32" lean-forward="true" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
-          <folding>
-            <element signature="e#2635#2636#0" expanded="true" />
-            <element signature="e#2671#2672#0" expanded="true" />
-            <element signature="e#2727#2728#0" expanded="true" />
-            <element signature="e#2777#2778#0" expanded="true" />
-            <element signature="e#2877#2878#0" expanded="true" />
-            <element signature="e#2911#2912#0" expanded="true" />
-            <element signature="e#2963#2964#0" expanded="true" />
-            <element signature="e#3009#3010#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -972,14 +765,481 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+        <state relative-caret-position="66">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="59" column="46" lean-forward="true" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3586">
+          <caret line="179" column="16" selection-start-line="179" selection-start-column="16" selection-end-line="179" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5478">
+          <caret line="273" column="3" selection-start-line="273" selection-start-column="3" selection-end-line="273" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1870">
+          <caret line="147" column="11" selection-start-line="147" selection-start-column="11" selection-end-line="147" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="55" column="15" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="106">
+          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="290" column="41" lean-forward="true" selection-start-line="290" selection-start-column="41" selection-end-line="290" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="21" column="32" lean-forward="true" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="550">
+          <caret line="38" column="89" selection-start-line="38" selection-start-column="89" selection-end-line="38" selection-end-column="89" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="11" column="28" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1166">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="818">
+          <caret line="285" column="13" lean-forward="true" selection-start-line="285" selection-start-column="13" selection-end-line="285" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="129" column="31" lean-forward="true" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="323" column="72" lean-forward="true" selection-start-line="323" selection-start-column="72" selection-end-line="323" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="44" column="13" lean-forward="true" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-638">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="244">
+          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="157">
+          <caret line="16" column="55" lean-forward="true" selection-start-line="16" selection-start-column="55" selection-end-line="16" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="270" column="33" lean-forward="true" selection-start-line="270" selection-start-column="33" selection-end-line="270" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="490">
+          <caret line="141" selection-start-line="141" selection-end-line="141" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="164" column="5" lean-forward="true" selection-start-line="164" selection-start-column="5" selection-end-line="164" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/apiTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-242">
+          <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="61" column="16" lean-forward="true" selection-start-line="61" selection-start-column="16" selection-end-line="61" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="700">
+          <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="12" column="34" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="39" column="9" lean-forward="true" selection-start-line="39" selection-start-column="9" selection-end-line="39" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="32" column="29" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="29" />
           <folding>
-            <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-            <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#1838#1839#0" expanded="true" />
+            <element signature="e#1863#1864#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1925#1926#0" expanded="true" />
+            <element signature="e#1822#1823#0" expanded="true" />
+            <element signature="e#1851#1852#0" expanded="true" />
+            <element signature="e#1895#1896#0" expanded="true" />
+            <element signature="e#1931#1932#0" expanded="true" />
+            <element signature="e#2132#2133#0" expanded="true" />
+            <element signature="e#2164#2165#0" expanded="true" />
+            <element signature="e#2214#2215#0" expanded="true" />
+            <element signature="e#2256#2257#0" expanded="true" />
+            <element signature="e#2330#2331#0" expanded="true" />
+            <element signature="e#2370#2371#0" expanded="true" />
+            <element signature="e#2436#2437#0" expanded="true" />
+            <element signature="e#2494#2495#0" expanded="true" />
+            <element signature="e#2569#2570#0" expanded="true" />
+            <element signature="e#2602#2603#0" expanded="true" />
+            <element signature="e#2654#2655#0" expanded="true" />
+            <element signature="e#2698#2699#0" expanded="true" />
+            <element signature="e#2764#2765#0" expanded="true" />
+            <element signature="e#2795#2796#0" expanded="true" />
+            <element signature="e#2843#2844#0" expanded="true" />
+            <element signature="e#2883#2884#0" expanded="true" />
+            <element signature="e#2948#2949#0" expanded="true" />
+            <element signature="e#2980#2981#0" expanded="true" />
+            <element signature="e#3030#3031#0" expanded="true" />
+            <element signature="e#3072#3073#0" expanded="true" />
+            <element signature="e#3134#3135#0" expanded="true" />
+            <element signature="e#3162#3163#0" expanded="true" />
+            <element signature="e#3204#3205#0" expanded="true" />
+            <element signature="e#3238#3239#0" expanded="true" />
+            <element signature="e#3307#3308#0" expanded="true" />
+            <element signature="e#3346#3347#0" expanded="true" />
+            <element signature="e#3410#3411#0" expanded="true" />
+            <element signature="e#3466#3467#0" expanded="true" />
+            <element signature="e#3537#3538#0" expanded="true" />
+            <element signature="e#3567#3568#0" expanded="true" />
+            <element signature="e#3613#3614#0" expanded="true" />
+            <element signature="e#3651#3652#0" expanded="true" />
+            <element signature="e#3721#3722#0" expanded="true" />
+            <element signature="e#3759#3760#0" expanded="true" />
+            <element signature="e#3821#3822#0" expanded="true" />
+            <element signature="e#3875#3876#0" expanded="true" />
+            <element signature="e#3953#3954#0" expanded="true" />
+            <element signature="e#3991#3992#0" expanded="true" />
+            <element signature="e#4053#4054#0" expanded="true" />
+            <element signature="e#4107#4108#0" expanded="true" />
+            <element signature="e#4186#4187#0" expanded="true" />
+            <element signature="e#4225#4226#0" expanded="true" />
+            <element signature="e#4289#4290#0" expanded="true" />
+            <element signature="e#4345#4346#0" expanded="true" />
+            <element signature="e#4430#4431#0" expanded="true" />
+            <element signature="e#4474#4475#0" expanded="true" />
+            <element signature="e#4698#4699#0" expanded="true" />
+            <element signature="e#4740#4741#0" expanded="true" />
+            <element signature="e#4810#4811#0" expanded="true" />
+            <element signature="e#4872#4873#0" expanded="true" />
+            <element signature="e#4955#4956#0" expanded="true" />
+            <element signature="e#4994#4995#0" expanded="true" />
+            <element signature="e#5058#5059#0" expanded="true" />
+            <element signature="e#5114#5115#0" expanded="true" />
+            <element signature="e#5194#5195#0" expanded="true" />
+            <element signature="e#5233#5234#0" expanded="true" />
+            <element signature="e#5297#5298#0" expanded="true" />
+            <element signature="e#5353#5354#0" expanded="true" />
+            <element signature="e#5428#5429#0" expanded="true" />
+            <element signature="e#5462#5463#0" expanded="true" />
+            <element signature="e#5516#5517#0" expanded="true" />
+            <element signature="e#5562#5563#0" expanded="true" />
+            <element signature="e#5634#5635#0" expanded="true" />
+            <element signature="e#5670#5671#0" expanded="true" />
+            <element signature="e#5728#5729#0" expanded="true" />
+            <element signature="e#5778#5779#0" expanded="true" />
+            <element signature="e#5852#5853#0" expanded="true" />
+            <element signature="e#5888#5889#0" expanded="true" />
+            <element signature="e#5946#5947#0" expanded="true" />
+            <element signature="e#5996#5997#0" expanded="true" />
+            <element signature="e#6067#6068#0" expanded="true" />
+            <element signature="e#6100#6101#0" expanded="true" />
+            <element signature="e#6152#6153#0" expanded="true" />
+            <element signature="e#6196#6197#0" expanded="true" />
+            <element signature="e#6261#6262#0" expanded="true" />
+            <element signature="e#6291#6292#0" expanded="true" />
+            <element signature="e#6337#6338#0" expanded="true" />
+            <element signature="e#6375#6376#0" expanded="true" />
+            <element signature="e#6437#6438#0" expanded="true" />
+            <element signature="e#6467#6468#0" expanded="true" />
+            <element signature="e#6513#6514#0" expanded="true" />
+            <element signature="e#6551#6552#0" expanded="true" />
+            <element signature="e#6613#6614#0" expanded="true" />
+            <element signature="e#6643#6644#0" expanded="true" />
+            <element signature="e#6689#6690#0" expanded="true" />
+            <element signature="e#6727#6728#0" expanded="true" />
+            <element signature="e#6796#6797#0" expanded="true" />
+            <element signature="e#6829#6830#0" expanded="true" />
+            <element signature="e#6881#6882#0" expanded="true" />
+            <element signature="e#6925#6926#0" expanded="true" />
+            <element signature="e#6995#6996#0" expanded="true" />
+            <element signature="e#7030#7031#0" expanded="true" />
+            <element signature="e#7086#7087#0" expanded="true" />
+            <element signature="e#7134#7135#0" expanded="true" />
+            <element signature="e#7202#7203#0" expanded="true" />
+            <element signature="e#7233#7234#0" expanded="true" />
+            <element signature="e#7281#7282#0" expanded="true" />
+            <element signature="e#7321#7322#0" expanded="true" />
+            <element signature="e#7390#7391#0" expanded="true" />
+            <element signature="e#7426#7427#0" expanded="true" />
+            <element signature="e#7484#7485#0" expanded="true" />
+            <element signature="e#7534#7535#0" expanded="true" />
+            <element signature="e#7602#7603#0" expanded="true" />
+            <element signature="e#7636#7637#0" expanded="true" />
+            <element signature="e#7690#7691#0" expanded="true" />
+            <element signature="e#7736#7737#0" expanded="true" />
+            <element signature="e#7806#7807#0" expanded="true" />
+            <element signature="e#7840#7841#0" expanded="true" />
+            <element signature="e#7894#7895#0" expanded="true" />
+            <element signature="e#7940#7941#0" expanded="true" />
+            <element signature="e#8006#8007#0" expanded="true" />
+            <element signature="e#8036#8037#0" expanded="true" />
+            <element signature="e#8082#8083#0" expanded="true" />
+            <element signature="e#8120#8121#0" expanded="true" />
+            <element signature="e#8189#8190#0" expanded="true" />
+            <element signature="e#8226#8227#0" expanded="true" />
+            <element signature="e#8286#8287#0" expanded="true" />
+            <element signature="e#8338#8339#0" expanded="true" />
+            <element signature="e#8417#8418#0" expanded="true" />
+            <element signature="e#8457#8458#0" expanded="true" />
+            <element signature="e#8523#8524#0" expanded="true" />
+            <element signature="e#8581#8582#0" expanded="true" />
+            <element signature="e#8655#8656#0" expanded="true" />
+            <element signature="e#8687#8688#0" expanded="true" />
+            <element signature="e#8737#8738#0" expanded="true" />
+            <element signature="e#8779#8780#0" expanded="true" />
+            <element signature="e#8846#8847#0" expanded="true" />
+            <element signature="e#8879#8880#0" expanded="true" />
+            <element signature="e#8931#8932#0" expanded="true" />
+            <element signature="e#8975#8976#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#787#788#0" expanded="true" />
+            <element signature="e#817#818#0" expanded="true" />
+            <element signature="e#2105#2106#0" expanded="true" />
+            <element signature="e#2135#2136#0" expanded="true" />
+            <element signature="e#2431#2432#0" expanded="true" />
+            <element signature="e#2461#2462#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index 854f1f1..0db633a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -165,12 +165,16 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String startDay,String endDay) {
+    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew) {
         try {
 
             Criteria criteria = createCriteria(PgAlarm.class);
             criteria.addOrder(Order.desc("id"));
 
+            if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) {
+                criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
+            }
+
             if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay))
             {
                 criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay)));
@@ -193,9 +197,11 @@
 
                 criteria.add(Restrictions.le("alarmDate",date));
             }
+            if(StringUtils.isNotBlank(isNew)&&isNew.equals("true"))
+                criteria.add(Restrictions.eq("active", 1));
 
             List<PgAlarm> pgAlarmList = criteria.list();
-            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
     }
 
     //根据设备位置(仓位)获取摄像机列表
-    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+    public List<PgDeviceDto> getPgCameraListByPosition(String partition,String position){
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.like("position",position+"%"));
-//        criteria.add(Restrictions.eq("devType","球机"));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(position))
+            criteria.add(Restrictions.like("position",position+"%"));
+
         criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
 
         List<PgDevice> pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
             dto.setDevCode(objects[5].toString());
             dto.setDevType(objects[6].toString());
             if(objects[7]!=null)
-            dto.setIp(objects[7].toString());
+                dto.setIp(objects[7].toString());
             dto.setIsOpen(objects[8].toString());
             dto.setPartition(objects[11].toString());
             dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index 8ebf74d..3c657a7 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgEquipment;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
 import com.casic.PgInterface.devTable.dto.PgEquipmentDto;
@@ -34,9 +35,12 @@
     public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
-        criteria.add(Restrictions.eq("eqName",eqName));
-        criteria.add(Restrictions.eq("eqCode",eqCode));
-        criteria.add(Restrictions.eq("eqType",eqType));
+        if(StringUtils.isNotBlank(eqName))
+            criteria.add(Restrictions.eq("eqName",eqName));
+        if(StringUtils.isNotBlank(eqCode))
+            criteria.add(Restrictions.eq("eqCode",eqCode));
+        if(StringUtils.isNotBlank(eqType))
+            criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
@@ -51,10 +55,9 @@
 
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
-        //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
         String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
-        +eqType+"' group by equipment.EQ_NAME";
+                +eqType+"' group by equipment.EQ_NAME";
 
         List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4ed68e4..e413a5c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
@@ -39,7 +40,8 @@
 
     public List<PgPipeLineDto> getPipeLineByLineType(String lineType) {
         Criteria criteria = createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineType", lineType));
+        if(StringUtils.isNotBlank(lineType))
+            criteria.add(Restrictions.eq("lineType", lineType));
 
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    private Long id;
-    private String keyId;//巡检记录单id
-    private String planId;//巡检计划ID
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    @Column(name="KEY_ID")
-    public String getKeyId() {
-        return keyId;
-    }
-
-    public void setKeyId(String keyId) {
-        this.keyId = keyId;
-    }
-
-    @Column(name="PLAN_ID")
-    public String getPlanId() {
-        return planId;
-    }
-
-    public void setPlanId(String planId) {
-        this.planId = planId;
-    }
-
-    @Column(name="CREATE_DATE")
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    @Column(name="STATE")
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    @Column(name="CREATOR")
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    @Column(name="PLAN_NAME")
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    @Column(name="RECORD_NO")
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    @Column(name="PLAN_NO")
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    @Column(name="RESPONSIBIE_DEPT")
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    @Column(name="INSPECTION_PERSON")
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    @Column(name="PATROL_MAN")
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    @Column(name="OPERATE_DATE")
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    @Column(name="REMARK")
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Column(name="BUILD_CABIN")
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    @Column(name="PROJECT")
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    @Column(name="START_PILE_NO")
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    @Column(name="END_PILE_NO")
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    @Column(name="INSPECTION_PRACE")
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    @Column(name="OTHER_PATROL_MAN")
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private Long id;
+    private String KEY_ID;//唯一键值
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_PERSON;//巡检人
+    private String START_DATE;//巡检开始时间
+    private String END_DATE;
+    private String FREQUENCY;//巡检频率
+    private String STATE;//状态
+    private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+    private String PLAN_NO;//巡检计划编号
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_MODE;//巡检方式
+    private String INSPECTION_ROUTE;//巡检路线
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String INSPECTION_GROUP;//巡检部门
+    private String INSERT_TIME;//插入时间
+    private String FREQUENCYDATE;//巡检具体日期
+    private String FREQUENCYTIME;//巡检具体时间
+    private String CREATEDATE;//创建时间
+    private String CREATOR;//创建人
+    private String PROJECT;//项目
+    private String COMLILE;//编制人
+    private String START_TIME;//编制时间
+    private String DEVELOP_DEPT;//制定部门
+    private String END_TIME;//结束时间
+    private String START_PILE_NO;//开始桩号
+    private String END_PILE_NO;//结束桩号
+    private String BUILD_CABIN;//巡检舱室
+    private String MILEAGE;
+    private String FREQUENCY_TIME;//巡检具体时间
+    private String FREQUENCYTIME_END;
+    private String KETTLE_TS;
+    private String UPDATEDATE;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="KEY_ID")
+    public String getKEY_ID() {
+        return KEY_ID;
+    }
+
+    public void setKEY_ID(String KEY_ID) {
+        this.KEY_ID = KEY_ID;
+    }
+
+    @Column(name="PLAN_NAME")
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    @Column(name="INSPECTION_PERSON")
+    public String getINSPECTION_PERSON() {
+        return INSPECTION_PERSON;
+    }
+
+    public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+        this.INSPECTION_PERSON = INSPECTION_PERSON;
+    }
+
+    @Column(name="START_DATE")
+    public String getSTART_DATE() {
+        return START_DATE;
+    }
+
+    public void setSTART_DATE(String START_DATE) {
+        this.START_DATE = START_DATE;
+    }
+
+    @Column(name="END_DATE")
+    public String getEND_DATE() {
+        return END_DATE;
+    }
+
+    public void setEND_DATE(String END_DATE) {
+        this.END_DATE = END_DATE;
+    }
+
+    @Column(name="FREQUENCY")
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    @Column(name="STATE")
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    @Column(name="RESPONSIBLE_DEPT")
+    public String getRESPONSIBLE_DEPT() {
+        return RESPONSIBLE_DEPT;
+    }
+
+    public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+        this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+    }
+
+    @Column(name="PLAN_NO")
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    @Column(name="INSPECTION_TYPE")
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    @Column(name="INSPECTION_MODE")
+    public String getINSPECTION_MODE() {
+        return INSPECTION_MODE;
+    }
+
+    public void setINSPECTION_MODE(String INSPECTION_MODE) {
+        this.INSPECTION_MODE = INSPECTION_MODE;
+    }
+
+    @Column(name="INSPECTION_ROUTE")
+    public String getINSPECTION_ROUTE() {
+        return INSPECTION_ROUTE;
+    }
+
+    public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+        this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+    }
+
+    @Column(name="INSPECTION_START_TIME")
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    @Column(name="INSPECTION_END_TIME")
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    @Column(name="INSPECTION_PRACE")
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    @Column(name="INSPECTION_GROUP")
+    public String getINSPECTION_GROUP() {
+        return INSPECTION_GROUP;
+    }
+
+    public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+        this.INSPECTION_GROUP = INSPECTION_GROUP;
+    }
+
+    @Column(name="INSERT_TIME")
+    public String getINSERT_TIME() {
+        return INSERT_TIME;
+    }
+
+    public void setINSERT_TIME(String INSERT_TIME) {
+        this.INSERT_TIME = INSERT_TIME;
+    }
+
+    @Column(name="FREQUENCYDATE")
+    public String getFREQUENCYDATE() {
+        return FREQUENCYDATE;
+    }
+
+    public void setFREQUENCYDATE(String FREQUENCYDATE) {
+        this.FREQUENCYDATE = FREQUENCYDATE;
+    }
+
+    @Column(name="FREQUENCYTIME")
+    public String getFREQUENCYTIME() {
+        return FREQUENCYTIME;
+    }
+
+    public void setFREQUENCYTIME(String FREQUENCYTIME) {
+        this.FREQUENCYTIME = FREQUENCYTIME;
+    }
+
+    @Column(name="CREATEDATE")
+    public String getCREATEDATE() {
+        return CREATEDATE;
+    }
+
+    public void setCREATEDATE(String CREATEDATE) {
+        this.CREATEDATE = CREATEDATE;
+    }
+
+    @Column(name="CREATOR")
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    @Column(name="PROJECT")
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    @Column(name="COMLILE")
+    public String getCOMLILE() {
+        return COMLILE;
+    }
+
+    public void setCOMLILE(String COMLILE) {
+        this.COMLILE = COMLILE;
+    }
+
+    @Column(name="START_TIME")
+    public String getSTART_TIME() {
+        return START_TIME;
+    }
+
+    public void setSTART_TIME(String START_TIME) {
+        this.START_TIME = START_TIME;
+    }
+
+    @Column(name="DEVELOP_DEPT")
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    @Column(name="END_TIME")
+    public String getEND_TIME() {
+        return END_TIME;
+    }
+
+    public void setEND_TIME(String END_TIME) {
+        this.END_TIME = END_TIME;
+    }
+
+    @Column(name="START_PILE_NO")
+    public String getSTART_PILE_NO() {
+        return START_PILE_NO;
+    }
+
+    public void setSTART_PILE_NO(String START_PILE_NO) {
+        this.START_PILE_NO = START_PILE_NO;
+    }
+
+    @Column(name="END_PILE_NO")
+    public String getEND_PILE_NO() {
+        return END_PILE_NO;
+    }
+
+    public void setEND_PILE_NO(String END_PILE_NO) {
+        this.END_PILE_NO = END_PILE_NO;
+    }
+
+    @Column(name="BUILD_CABIN")
+    public String getBUILD_CABIN() {
+        return BUILD_CABIN;
+    }
+
+    public void setBUILD_CABIN(String BUILD_CABIN) {
+        this.BUILD_CABIN = BUILD_CABIN;
+    }
+
+    @Column(name="MILEAGE")
+    public String getMILEAGE() {
+        return MILEAGE;
+    }
+
+    public void setMILEAGE(String MILEAGE) {
+        this.MILEAGE = MILEAGE;
+    }
+
+    @Column(name="FREQUENCY_TIME")
+    public String getFREQUENCY_TIME() {
+        return FREQUENCY_TIME;
+    }
+
+    public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+        this.FREQUENCY_TIME = FREQUENCY_TIME;
+    }
+
+    @Column(name="FREQUENCYTIME_END")
+    public String getFREQUENCYTIME_END() {
+        return FREQUENCYTIME_END;
+    }
+
+    public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+        this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+    }
+
+    @Column(name="KETTLE_TS")
+    public String getKETTLE_TS() {
+        return KETTLE_TS;
+    }
+
+    public void setKETTLE_TS(String KETTLE_TS) {
+        this.KETTLE_TS = KETTLE_TS;
+    }
+
+    @Column(name="UPDATEDATE")
+    public String getUPDATEDATE() {
+        return UPDATEDATE;
+    }
+
+    public void setUPDATEDATE(String UPDATEDATE) {
+        this.UPDATEDATE = UPDATEDATE;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 5346b57..2f8d359 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -66,7 +66,7 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REPAIRMAN")
+    @Column(name="REOAIRMAN")
     public String getRepairMan() {
         return repairMan;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
-    private Long id;
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-
-
-    public static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
-        PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
-        pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
-        pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
-        pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
-        pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
-        pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
-        pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
-        pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
-        pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
-        pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
-        pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
-        pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
-        pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
-        pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
-        pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
-        return pgAssetInSpectionRecordDto;
-    }
-
-
-    public static List<PgAssetInSpectionRecordDto> ConvertToDtoList(List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList){
-        List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-        for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
-            pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
-        }
-
-        return pgAssetInSpectionRecordDtoList;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
-    private String num;
-    private String createDate;
-
-    public String getNum() {
-        return num;
-    }
-
-    public void setNum(String num) {
-        this.num = num;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+    private Long id;
+    private String PLAN_NO;//巡检计划编号
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String FREQUENCY;//巡检频率
+    private String CREATOR;//创建人
+    private String DEVELOP_DEPT;//制定部门
+    private String PROJECT;//项目
+    private String STATE;//状态
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+        PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+        pgAssetPlanDto.setId(pgAssetPlan.getId());
+        pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+        pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+        pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+        pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+        pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+        pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+        pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+        pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+        pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+        pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+        pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+        return pgAssetPlanDto;
+    }
+
+    public static List<PgAssetPlanDto> ConvertToPgAssetDtoList(List<PgAssetPlan> pgAssetPlanList){
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
+
+        for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+            pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+        }
+
+        return pgAssetPlanDtoList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
new file mode 100644
index 0000000..bc12db1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
@@ -0,0 +1,24 @@
+package com.casic.PgInterface.maintenance.dto;
+
+public class PgAssetPlanStatic {
+
+    private String num;
+    private String createDate;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
deleted file mode 100644
index c41ca7d..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.casic.PgInterface.maintenance.manager;
-
-import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
-
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
-        try {
-            String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
-                    "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
-                    "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-
-            if(patrolMan!=null)
-                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
-            if(startTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
-            if(endTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')<to_date('"+endTime+"','yyyy-MM-dd')";
-
-            sql+=" order by id";
-
-            List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
-
-            List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList=new ArrayList<>();
-            for(Object[] objects1:objects){
-                PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord();
-
-                pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString()));
-                pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1]));
-                pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2]));
-                pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3]));
-                pgAssetInSpectionRecord.setState(String.valueOf(objects1[4]));
-                pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5]));
-                pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6]));
-                pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7]));
-                pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8]));
-                pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9]));
-                pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10]));
-                pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11]));
-                pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12]));
-                pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13]));
-                pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14]));
-                pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15]));
-                pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16]));
-                pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17]));
-                pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18]));
-                pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19]));
-
-                pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord);
-            }
-
-            List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-            for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList)
-            {
-                pgAssetInSpectionRecordDtoList.add(PgAssetInSpectionRecordDto.ConvertToDto(pgAssetInSpectionRecord));
-            }
-
-            return pgAssetInSpectionRecordDtoList;
-        }
-        catch(Exception e)
-        {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public List<PgAssetInSpectionRecordStatic> getPgAssetInSpectionRecordStaticLisByTime(
-            String startTime, String endTime, String staticType) {
-
-        String sql="";
-        String dateType="";
-        List<PgAssetInSpectionRecordStatic> pgAssetInSpectionRecordStaticList=new ArrayList<>();
-        int type=Integer.valueOf(staticType);
-
-        switch(type) {
-            case 0://年
-                dateType = "yyyy";
-                break;
-            case 1://月
-                dateType = "yyyy-mm";
-                break;
-            case 2://周
-                dateType = "iw";
-                break;
-            case 3://日
-                dateType="yyyy-mm-dd";
-                break;
-            default:
-                break;
-        }
-
-        sql="select count(*), to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_RECORD t where 1=1";
-
-        if(startTime!=null)
-            sql+=" and t.CREATE_DATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
-        if(endTime!=null)
-            sql+=" and t.CREATE_DATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
-
-        sql+=" group by to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"')";
-
-        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
-        for(int i=0;i<objects.size();i++)
-        {
-            PgAssetInSpectionRecordStatic pgAssetInSpectionRecordStatic=new PgAssetInSpectionRecordStatic();
-            pgAssetInSpectionRecordStatic.setNum(objects.get(i)[0].toString());
-            pgAssetInSpectionRecordStatic.setCreateDate(objects.get(i)[1].toString());
-            pgAssetInSpectionRecordStaticList.add(pgAssetInSpectionRecordStatic);
-        }
-        return pgAssetInSpectionRecordStaticList;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
new file mode 100644
index 0000000..bb6bf1e
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
@@ -0,0 +1,81 @@
+package com.casic.PgInterface.maintenance.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgAssetPlanManager extends HibernateEntityDao<PgAssetPlan> {
+
+    public List<PgAssetPlanDto> getPgAssetPlanDtoList(String inSpectionPlace){
+        Criteria criteria=createCriteria(PgAssetPlan.class);
+
+        if(StringUtils.isNotBlank(inSpectionPlace))
+            criteria.add(Restrictions.like("INSPECTION_PRACE","%"+inSpectionPlace+"%"));
+        criteria.addOrder(Order.desc("id"));
+
+        List<PgAssetPlan> pgAssetPlanList=criteria.list();
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=PgAssetPlanDto.ConvertToPgAssetDtoList(pgAssetPlanList);
+
+        if(pgAssetPlanDtoList==null||pgAssetPlanDtoList.size()==0)
+            return null;
+        else
+            return pgAssetPlanDtoList;
+    }
+
+    public List<PgAssetPlanStatic> getPgAssetPlanStaticLisByTime(
+            String startTime, String endTime, String staticType) {
+
+        String sql="";
+        String dateType="";
+        List<PgAssetPlanStatic> pgAssetPlanStaticList=new ArrayList<>();
+        int type=Integer.valueOf(staticType);
+
+        switch(type) {
+            case 0://年
+                dateType = "yyyy";
+                break;
+            case 1://月
+                dateType = "yyyy-mm";
+                break;
+            case 2://周
+                dateType = "iw";
+                break;
+            case 3://日
+                dateType="yyyy-mm-dd";
+                break;
+            default:
+                break;
+        }
+
+        sql="select count(*), to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_PLAN t where 1=1";
+
+        if(startTime!=null)
+            sql+=" and t.CREATEDATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
+        if(endTime!=null)
+            sql+=" and t.CREATEDATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
+
+        sql+=" group by to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"')";
+
+        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
+        for(int i=0;i<objects.size();i++)
+        {
+            PgAssetPlanStatic pgAssetPlanStatic=new PgAssetPlanStatic();
+            pgAssetPlanStatic.setNum(objects.get(i)[0].toString());
+            pgAssetPlanStatic.setCreateDate(objects.get(i)[1].toString());
+            pgAssetPlanStaticList.add(pgAssetPlanStatic);
+        }
+        return pgAssetPlanStaticList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 0903f22..3484739 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -15,7 +15,7 @@
 
     public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
             if(repairMan!=null)
                 sql+=" and REPAIRMAN like '%"+repairMan+"%'";
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index 9cc2881..6d90d7b 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -1,5 +1,7 @@
 package com.casic.PgInterface.patroler.dto;
 
+import com.casic.PgInterface.devTable.domain.PgDevice;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 
 /**
@@ -14,6 +16,7 @@
     private String unit;//单位
     private String alarmType;//报警类型
     private Long pgDeviceId;//设备编号
+    private String assetCode;//资产编号
 
     public Long getId() {
         return id;
@@ -71,7 +74,15 @@
         this.pgDeviceId = pgDeviceId;
     }
 
-    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
+    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule, PgDeviceManager pgDeviceManager) {
         this.setId(pgAlarmRule.getId());
         this.setHighValue(pgAlarmRule.getHighValue());
         this.setLowValue(pgAlarmRule.getLowValue());
@@ -82,6 +93,10 @@
         else
             this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
         this.setPgDeviceId(pgAlarmRule.getPgDeviceId());
+        if(pgAlarmRule.getAlarmTypeId()!=null&&pgDeviceManager.get(pgAlarmRule.getPgDeviceId())!=null)
+            this.setAssetCode(pgDeviceManager.get(pgAlarmRule.getPgDeviceId()).getAssetCode());
+        else
+            this.setAssetCode("");
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
index c132c98..a7cef5b 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
@@ -1,13 +1,17 @@
 package com.casic.PgInterface.patroler.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.ResponseStatus;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -17,30 +21,23 @@
 @Service
 public class PgAlarmRuleManager extends HibernateEntityDao<PgAlarmRule> {
 
+    @Resource
+    private PgDeviceManager pgDeviceManager;
+
     //根据设备获取设备报警阈值
-    public List<PgAlarmRuleDto>  getAlarmRuleDto() {
+    public List<PgAlarmRuleDto>  getAlarmRuleDto(String devType) {
         Criteria criteria=createCriteria(PgAlarmRule.class);
+
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.eq("devType", devType));
         criteria.addOrder(Order.desc("id"));
 
         List<PgAlarmRule> pgAlarmRuleList=criteria.list();
-        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
+        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         for (PgAlarmRule pgAlarmRule : pgAlarmRuleList) {
-            pgAlarmRuleDtoList.add(new PgAlarmRuleDto(pgAlarmRule));
+            pgAlarmRuleDtoList.add(new PgAlarmRuleDto(pgAlarmRule,pgDeviceManager));
         }
         return pgAlarmRuleDtoList;
-
     }
 
-    public PgAlarmRule getAlarmRuleBydevType(String devType) {
-        Criteria criteria=createCriteria(PgAlarmRule.class);
-        criteria.add(Restrictions.eq("devType", devType));
-
-        List<PgAlarmRule> pgAlarmRuleList=criteria.list();
-
-        if(pgAlarmRuleList==null||pgAlarmRuleList.size()==0)
-            return null;
-        else
-            return pgAlarmRuleList.get(0);
-    }
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index d0e28f5..082ba5d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgAlarm;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
@@ -39,7 +40,7 @@
     private PgReservePlanManager pgReservePlanManager;
 
     /*
-    * 获取报警设备信息
+     * 获取报警设备信息
      */
     @POST
     @Path("linkDevice")
@@ -50,11 +51,22 @@
 
         PgDeviceDto pgDeviceDto = null;
         try {
-            PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
-            PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
-
-            pgDeviceDto=new PgDeviceDto(pgDevice);
-            msg = "报警关联设备获取成功";
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if (pgAlarm == null)
+                    msg = "不存在报警信息";
+                else {
+                    PgDevice pgDevice = pgAlarm.getAlarmDevId();
+                    if (pgDevice == null)
+                        msg = "不存在报警设备";
+                    else {
+                        pgDeviceDto = new PgDeviceDto(pgDevice);
+                        msg = "报警关联设备获取成功";
+                    }
+                }
+            }
+            else
+                msg="未接受到报警设备ID信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取关联设备失败";
@@ -77,11 +89,28 @@
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
-            PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
-            PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
-            pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if(pgAlarm==null)
+                    msg="不存在报警信息";
+                else {
+                    PgDevice pgDevice = pgAlarm.getAlarmDevId();
+                    if (pgDevice == null)
+                        msg = "不存在报警设备";
+                    else {
+                        String strPosition=pgDevice.getPosition();
+                        String position="";
+                        if(!strPosition.equals(""))
+                            position=pgDevice.getPosition().substring(0,3);
+                        String partition=pgDevice.getPartition();
 
-            msg = "关联设备获取成功";
+                        pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
+                        msg = "关联设备获取成功";
+                    }
+                }
+            }
+            else
+                msg="请输入报警设备Id信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "分区设备关联失败";
@@ -93,7 +122,7 @@
 
     /*
      * 根据报警记录获取关联的预案
-    */
+     */
     @POST
     @Path("linkReservePlan")
     @Produces(MediaType.APPLICATION_JSON)
@@ -103,10 +132,21 @@
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
-            PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
-            pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if (pgAlarm == null)
+                    msg = "不存在报警信息";
+                else {
+                    pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-            msg="关联预案获取成功";
+                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
+                        msg="不存在关联的报警预案";
+                    else
+                        msg = "关联预案获取成功";
+                }
+            }
+            else
+                msg="请输入报警信息";
         }
         catch(Exception e)
         {
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index d18ebb8..baacd93 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -48,14 +48,16 @@
     @POST
     @Path("getAlarmInfo")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmList(@FormParam("startDay") String startDay,
-                                            @FormParam("endDay") String endDay) throws Exception {
+    public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
+                                            @FormParam("startDay") String startDay,
+                                            @FormParam("endDay") String endDay,
+                                            @FormParam("isNew") String isNew) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(startDay,endDay);
-            if (pgAlarmDtoList.size() == 0)
+            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew);
+            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
                 msg = "没有报警信息";
             else
                 msg = "报警信息获取成功";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 87afd54..29ce8a4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -1,7 +1,5 @@
 package com.casic.PgInterface.rs;
 
-import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager;
-import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import com.casic.PgInterface.patroler.manager.PgAlarmRuleManager;
@@ -30,119 +28,23 @@
     private static Logger logger = LoggerFactory.getLogger(PgAlarmRule.class);
 
     @Resource
-    private PgDeviceManager pgDeviceManager;
-    @Resource
-    private PgAlarmTypeManager pgAlarmTypeManager;
-    @Resource
     private PgAlarmRuleManager pgAlarmRuleManager;
 
-
-
-    /**
-     * 新增报警阈值
-     */
-    @POST
-    @Path("addAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> addAlarmRule(@FormParam("highValue") String highValue,
-                                            @FormParam("lowValue") String lowValue,
-                                            @FormParam("unit") String unit,
-                                            @FormParam("devType") String devType,
-                                            @FormParam("alarmType") String alarmType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType);
-            if (pgAlarmRule != null) {
-                result = "false";
-                msg = "设备阈值已经存在";
-            } else {
-                pgAlarmRule = new PgAlarmRule();
-                pgAlarmRule.setHighValue(highValue);
-                pgAlarmRule.setLowValue(lowValue);
-                pgAlarmRule.setDevType(devType);
-                pgAlarmRule.setUnit(unit);
-                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
-
-                pgAlarmRuleManager.save(pgAlarmRule);
-                result = "true";
-                msg = "报警阈值新增成功";
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = "false";
-            msg = "报警阈值新增失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-        return resultMap;
-    }
-
-    /**
-     * 编辑报警阈值
-     */
-    @POST
-    @Path("editAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> editAlarmRule(@FormParam("id") String id,
-                                             @FormParam("devType") String devType,
-                                             @FormParam("highValue") String highValue,
-                                             @FormParam("lowValue") String lowValue,
-                                             @FormParam("unit") String unit,
-                                             @FormParam("alarmType") String alarmType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
-            if (pgAlarmRule == null) {
-                msg = "不存在报警阈值记录";
-                result = "false";
-            } else {
-                pgAlarmRule.setDevType(devType);
-                pgAlarmRule.setHighValue(highValue);
-                pgAlarmRule.setLowValue(lowValue);
-                pgAlarmRule.setUnit(unit);
-                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
-
-                pgAlarmRuleManager.save(pgAlarmRule);
-                msg = "编辑成功";
-                result = "true";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            result = "false";
-            msg = "报警阈值编辑失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-
-        return resultMap;
-    }
-
     /**
      * 获取报警阈值信息
      */
     @POST
     @Path("getAlarmRule")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmRule() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+    public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
+        System.out.println("devType:"+devType);
+        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
-            pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto();
-            if (pgAlarmRuleDtoList == null)
+            pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
+            if (pgAlarmRuleDtoList == null||pgAlarmRuleDtoList.size()==0)
                 msg = "不存在报警阈值信息";
             else
                 msg = "报警阈值获取成功";
@@ -155,69 +57,4 @@
         return resultMap;
     }
 
-    /**
-     * 删除报警阈值
-     */
-    @POST
-    @Path("deleteAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> deleteAlarmRule(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
-            if (pgAlarmRule == null) {
-                msg = "不存在报警阈值记录";
-                result = "false";
-            } else {
-                pgAlarmRuleManager.remove(pgAlarmRule);
-                msg = "删除成功";
-                result = "true";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            result = "false";
-            msg = "报警阈值删除失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-
-        return resultMap;
-    }
-
-    /**
-     * 根据设备类型报警阈值
-     */
-    @POST
-    @Path("getAlarmRuleByDevType")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmRuleByDevType(@FormParam("devType") String devType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        PgAlarmRule pgAlarmRule = null;
-        List<PgAlarmRuleDto> pgAlarmRuleDtos = new ArrayList<>();
-        try {
-            pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType);
-            if (pgAlarmRule == null)
-                msg = "不存在报警阈值记录";
-            else {
-                PgAlarmRuleDto pgAlarmRuleDto= new PgAlarmRuleDto(pgAlarmRule);
-                pgAlarmRuleDtos.add(pgAlarmRuleDto);
-                msg = "报警阈值获取成功";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            msg = "报警阈值获取失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmRuleDtos);
-
-        return resultMap;
-    }
-
 }
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ff69e2a..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,27 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190828.docx" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -32,72 +42,119 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="2" />
-          <entry key="java" value="243" />
-          <entry key="properties" value="6" />
+          <entry key="java" value="321" />
+          <entry key="properties" value="8" />
           <entry key="xml" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
-          <entry key="JAVA" value="243" />
-          <entry key="Properties" value="6" />
+          <entry key="JAVA" value="321" />
+          <entry key="Properties" value="8" />
           <entry key="XML" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="8082" />
-          <entry key="properties" value="49" />
-          <entry key="txt" value="64" />
+          <entry key="dummy" value="16" />
+          <entry key="java" value="10723" />
+          <entry key="properties" value="59" />
+          <entry key="txt" value="118" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="8082" />
-          <entry key="PLAIN_TEXT" value="64" />
-          <entry key="Properties" value="49" />
+          <entry key="JAVA" value="10723" />
+          <entry key="PLAIN_TEXT" value="134" />
+          <entry key="Properties" value="59" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="4" />
+          <entry key="project.closed" value="28" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
           <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.24" value="1" />
+          <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="1" />
-          <entry key="project.open.time.3" value="3" />
-          <entry key="project.open.time.31" value="1" />
+          <entry key="project.open.time.28" value="1" />
+          <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.31" value="2" />
           <entry key="project.open.time.37" value="1" />
+          <entry key="project.open.time.39" value="2" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.40" value="1" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="1" />
+          <entry key="project.open.time.44" value="2" />
           <entry key="project.open.time.45" value="2" />
           <entry key="project.open.time.48" value="1" />
           <entry key="project.open.time.49" value="1" />
+          <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.58" value="1" />
           <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.71" value="1" />
+          <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.71" value="2" />
           <entry key="project.open.time.76" value="1" />
-          <entry key="project.opened" value="25" />
+          <entry key="project.opened" value="41" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+            <state relative-caret-position="174">
+              <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
               <folding>
-                <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-                <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="352">
+              <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#787#788#0" expanded="true" />
+                <element signature="e#817#818#0" expanded="true" />
+                <element signature="e#2105#2106#0" expanded="true" />
+                <element signature="e#2135#2136#0" expanded="true" />
+                <element signature="e#2431#2432#0" expanded="true" />
+                <element signature="e#2461#2462#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="638">
+              <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+              <folding>
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -122,6 +179,7 @@
       <find>getPgDeviceByDevType</find>
       <find>message</find>
       <find>getConstructionByType</find>
+      <find>getPgCameraListByPosition</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -130,24 +188,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanTypeDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
@@ -162,17 +207,38 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
       </list>
     </option>
   </component>
@@ -208,16 +274,18 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="3" />
-    <option name="y" value="10" />
-    <option name="width" value="1386" />
-    <option name="height" value="788" />
+    <option name="x" value="1410" />
+    <option name="y" value="117" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -258,7 +326,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -267,16 +335,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -286,7 +345,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="dto" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -296,7 +355,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="manager" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -308,19 +367,10 @@
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="webapp" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -359,6 +409,7 @@
       </deployment>
       <server-settings>
         <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_7" />
+        <option name="JNDI_PORT" value="10991" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -456,7 +507,23 @@
       <workItem from="1566350810712" duration="6803000" />
       <workItem from="1566435787074" duration="10717000" />
       <workItem from="1566521753529" duration="14265000" />
-      <workItem from="1566614176989" duration="5693000" />
+      <workItem from="1566614176989" duration="14059000" />
+      <workItem from="1566780822009" duration="1026000" />
+      <workItem from="1566891563975" duration="284000" />
+      <workItem from="1566893107340" duration="3382000" />
+      <workItem from="1566953794976" duration="11039000" />
+      <workItem from="1567059357700" duration="484000" />
+      <workItem from="1567082835097" duration="1086000" />
+      <workItem from="1567126428020" duration="1539000" />
+      <workItem from="1567129277820" duration="5788000" />
+      <workItem from="1567136008996" duration="2568000" />
+      <workItem from="1567237040302" duration="111000" />
+      <workItem from="1567495626345" duration="2797000" />
+      <workItem from="1567558770152" duration="2352000" />
+      <workItem from="1567577368149" duration="640000" />
+      <workItem from="1567751224608" duration="780000" />
+      <workItem from="1568019299799" duration="695000" />
+      <workItem from="1568082566133" duration="4016000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -493,17 +560,60 @@
       <option name="project" value="LOCAL" />
       <updated>1566553388171</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="整理管线部分">
+      <created>1566620046627</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1566620046627</updated>
+    </task>
+    <task id="LOCAL-00007" summary="合并代码提交">
+      <created>1566781001910</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1566781001910</updated>
+    </task>
+    <task id="LOCAL-00008" summary="合并代码提交">
+      <created>1566963831930</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1566963831930</updated>
+    </task>
+    <task id="LOCAL-00009" summary="修改报警阈值">
+      <created>1566972146710</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1566972146710</updated>
+    </task>
+    <task id="LOCAL-00010" summary="修改巡检维护表字段">
+      <created>1567126525554</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1567126525554</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="142930000" />
+    <option name="totallyTimeSpent" value="189883000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
+    <frame x="1358" y="-8" width="1456" height="916" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29297996" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -511,13 +621,14 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Thumbnails" weight="0.3295082" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.5081967" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.3849105" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
       <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
       <window_info anchor="bottom" id="Spring" order="8" />
       <window_info anchor="bottom" id="Terminal" order="9" />
@@ -539,7 +650,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2193646" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -547,22 +658,23 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.47540984" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
-      <window_info anchor="bottom" id="Spring" order="8" />
-      <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
-      <window_info anchor="bottom" id="Statistic" order="11" />
-      <window_info anchor="bottom" id="Java Enterprise" order="12" />
-      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="14" weight="0.32786885" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.52307695" />
+      <window_info anchor="bottom" id="Thumbnails" order="0" weight="0.3295082" />
+      <window_info anchor="bottom" id="Message" order="1" />
+      <window_info anchor="bottom" id="Find" order="2" />
+      <window_info anchor="bottom" id="Run" order="3" />
+      <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.49924356" weight="0.49344262" />
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Application Servers" order="8" weight="0.3276923" />
+      <window_info anchor="bottom" id="Spring" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
+      <window_info anchor="bottom" id="Statistic" order="12" />
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <window_info anchor="bottom" id="Database Changes" order="14" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="15" weight="0.32786885" />
+      <window_info anchor="bottom" id="Messages" order="16" weight="0.5229508" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -578,6 +690,16 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -587,7 +709,11 @@
     <MESSAGE value="修改权限问题" />
     <MESSAGE value="修改人员登录返回接口" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整理管线部分" />
+    <MESSAGE value="合并代码提交" />
+    <MESSAGE value="修改报警阈值" />
+    <MESSAGE value="修改巡检维护表字段" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护表字段" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -602,322 +728,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-532">
-          <caret line="50" column="28" lean-forward="true" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="19" column="60" selection-start-line="19" selection-start-column="60" selection-end-line="19" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="100" column="34" lean-forward="true" selection-start-line="100" selection-start-column="34" selection-end-line="100" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1474">
-          <caret line="84" column="58" selection-start-line="84" selection-start-column="58" selection-end-line="84" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1100">
-          <caret line="58" column="18" selection-start-line="58" selection-start-column="18" selection-end-line="58" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6842">
-          <caret line="329" selection-start-line="329" selection-end-line="329" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="102" column="24" lean-forward="true" selection-start-line="102" selection-start-column="24" selection-end-line="102" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="72" column="56" lean-forward="true" selection-start-line="72" selection-start-column="56" selection-end-line="72" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="90" column="39" lean-forward="true" selection-start-line="90" selection-start-column="39" selection-end-line="90" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="97" column="16" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
-          <caret line="14" column="52" lean-forward="true" selection-start-line="14" selection-start-column="52" selection-end-line="14" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="26" column="34" lean-forward="true" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="61" column="1" lean-forward="true" selection-start-line="61" selection-start-column="1" selection-end-line="61" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="208" column="49" lean-forward="true" selection-start-line="208" selection-start-column="49" selection-end-line="208" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="140" column="57" selection-start-line="140" selection-start-column="57" selection-end-line="140" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="111" column="36" selection-start-line="111" selection-start-column="36" selection-end-line="111" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="3" lean-forward="true" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="81" column="58" lean-forward="true" selection-start-line="81" selection-start-column="58" selection-end-line="81" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="472">
-          <caret line="118" column="59" selection-start-line="118" selection-start-column="59" selection-end-line="118" selection-end-column="59" />
-          <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-198">
-          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="69" column="32" lean-forward="true" selection-start-line="69" selection-start-column="32" selection-end-line="70" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="142" column="59" lean-forward="true" selection-start-line="142" selection-start-column="59" selection-end-line="142" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="349" column="9" lean-forward="true" selection-start-line="349" selection-start-column="9" selection-end-line="349" selection-end-column="9" />
-          <folding>
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="e#12105#12121#0" expanded="true" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-686">
-          <caret line="67" column="31" lean-forward="true" selection-start-line="67" selection-start-column="31" selection-end-line="67" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="93" column="24" lean-forward="true" selection-start-line="93" selection-start-column="24" selection-end-line="93" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="57" column="23" lean-forward="true" selection-start-line="57" selection-start-column="23" selection-end-line="57" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-408">
-          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="98" column="40" lean-forward="true" selection-start-line="98" selection-start-column="40" selection-end-line="98" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="572">
@@ -925,13 +735,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="328" column="32" lean-forward="true" selection-start-line="328" selection-start-column="32" selection-end-line="328" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
@@ -950,16 +753,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="396">
           <caret line="23" column="32" lean-forward="true" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
-          <folding>
-            <element signature="e#2635#2636#0" expanded="true" />
-            <element signature="e#2671#2672#0" expanded="true" />
-            <element signature="e#2727#2728#0" expanded="true" />
-            <element signature="e#2777#2778#0" expanded="true" />
-            <element signature="e#2877#2878#0" expanded="true" />
-            <element signature="e#2911#2912#0" expanded="true" />
-            <element signature="e#2963#2964#0" expanded="true" />
-            <element signature="e#3009#3010#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -972,14 +765,481 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+        <state relative-caret-position="66">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="59" column="46" lean-forward="true" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3586">
+          <caret line="179" column="16" selection-start-line="179" selection-start-column="16" selection-end-line="179" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5478">
+          <caret line="273" column="3" selection-start-line="273" selection-start-column="3" selection-end-line="273" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1870">
+          <caret line="147" column="11" selection-start-line="147" selection-start-column="11" selection-end-line="147" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="55" column="15" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="106">
+          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="290" column="41" lean-forward="true" selection-start-line="290" selection-start-column="41" selection-end-line="290" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="21" column="32" lean-forward="true" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="550">
+          <caret line="38" column="89" selection-start-line="38" selection-start-column="89" selection-end-line="38" selection-end-column="89" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="11" column="28" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1166">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="818">
+          <caret line="285" column="13" lean-forward="true" selection-start-line="285" selection-start-column="13" selection-end-line="285" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="129" column="31" lean-forward="true" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="323" column="72" lean-forward="true" selection-start-line="323" selection-start-column="72" selection-end-line="323" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="44" column="13" lean-forward="true" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-638">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="244">
+          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="157">
+          <caret line="16" column="55" lean-forward="true" selection-start-line="16" selection-start-column="55" selection-end-line="16" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="270" column="33" lean-forward="true" selection-start-line="270" selection-start-column="33" selection-end-line="270" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="490">
+          <caret line="141" selection-start-line="141" selection-end-line="141" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="164" column="5" lean-forward="true" selection-start-line="164" selection-start-column="5" selection-end-line="164" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/apiTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-242">
+          <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="61" column="16" lean-forward="true" selection-start-line="61" selection-start-column="16" selection-end-line="61" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="700">
+          <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="12" column="34" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="39" column="9" lean-forward="true" selection-start-line="39" selection-start-column="9" selection-end-line="39" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="32" column="29" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="29" />
           <folding>
-            <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-            <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#1838#1839#0" expanded="true" />
+            <element signature="e#1863#1864#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1925#1926#0" expanded="true" />
+            <element signature="e#1822#1823#0" expanded="true" />
+            <element signature="e#1851#1852#0" expanded="true" />
+            <element signature="e#1895#1896#0" expanded="true" />
+            <element signature="e#1931#1932#0" expanded="true" />
+            <element signature="e#2132#2133#0" expanded="true" />
+            <element signature="e#2164#2165#0" expanded="true" />
+            <element signature="e#2214#2215#0" expanded="true" />
+            <element signature="e#2256#2257#0" expanded="true" />
+            <element signature="e#2330#2331#0" expanded="true" />
+            <element signature="e#2370#2371#0" expanded="true" />
+            <element signature="e#2436#2437#0" expanded="true" />
+            <element signature="e#2494#2495#0" expanded="true" />
+            <element signature="e#2569#2570#0" expanded="true" />
+            <element signature="e#2602#2603#0" expanded="true" />
+            <element signature="e#2654#2655#0" expanded="true" />
+            <element signature="e#2698#2699#0" expanded="true" />
+            <element signature="e#2764#2765#0" expanded="true" />
+            <element signature="e#2795#2796#0" expanded="true" />
+            <element signature="e#2843#2844#0" expanded="true" />
+            <element signature="e#2883#2884#0" expanded="true" />
+            <element signature="e#2948#2949#0" expanded="true" />
+            <element signature="e#2980#2981#0" expanded="true" />
+            <element signature="e#3030#3031#0" expanded="true" />
+            <element signature="e#3072#3073#0" expanded="true" />
+            <element signature="e#3134#3135#0" expanded="true" />
+            <element signature="e#3162#3163#0" expanded="true" />
+            <element signature="e#3204#3205#0" expanded="true" />
+            <element signature="e#3238#3239#0" expanded="true" />
+            <element signature="e#3307#3308#0" expanded="true" />
+            <element signature="e#3346#3347#0" expanded="true" />
+            <element signature="e#3410#3411#0" expanded="true" />
+            <element signature="e#3466#3467#0" expanded="true" />
+            <element signature="e#3537#3538#0" expanded="true" />
+            <element signature="e#3567#3568#0" expanded="true" />
+            <element signature="e#3613#3614#0" expanded="true" />
+            <element signature="e#3651#3652#0" expanded="true" />
+            <element signature="e#3721#3722#0" expanded="true" />
+            <element signature="e#3759#3760#0" expanded="true" />
+            <element signature="e#3821#3822#0" expanded="true" />
+            <element signature="e#3875#3876#0" expanded="true" />
+            <element signature="e#3953#3954#0" expanded="true" />
+            <element signature="e#3991#3992#0" expanded="true" />
+            <element signature="e#4053#4054#0" expanded="true" />
+            <element signature="e#4107#4108#0" expanded="true" />
+            <element signature="e#4186#4187#0" expanded="true" />
+            <element signature="e#4225#4226#0" expanded="true" />
+            <element signature="e#4289#4290#0" expanded="true" />
+            <element signature="e#4345#4346#0" expanded="true" />
+            <element signature="e#4430#4431#0" expanded="true" />
+            <element signature="e#4474#4475#0" expanded="true" />
+            <element signature="e#4698#4699#0" expanded="true" />
+            <element signature="e#4740#4741#0" expanded="true" />
+            <element signature="e#4810#4811#0" expanded="true" />
+            <element signature="e#4872#4873#0" expanded="true" />
+            <element signature="e#4955#4956#0" expanded="true" />
+            <element signature="e#4994#4995#0" expanded="true" />
+            <element signature="e#5058#5059#0" expanded="true" />
+            <element signature="e#5114#5115#0" expanded="true" />
+            <element signature="e#5194#5195#0" expanded="true" />
+            <element signature="e#5233#5234#0" expanded="true" />
+            <element signature="e#5297#5298#0" expanded="true" />
+            <element signature="e#5353#5354#0" expanded="true" />
+            <element signature="e#5428#5429#0" expanded="true" />
+            <element signature="e#5462#5463#0" expanded="true" />
+            <element signature="e#5516#5517#0" expanded="true" />
+            <element signature="e#5562#5563#0" expanded="true" />
+            <element signature="e#5634#5635#0" expanded="true" />
+            <element signature="e#5670#5671#0" expanded="true" />
+            <element signature="e#5728#5729#0" expanded="true" />
+            <element signature="e#5778#5779#0" expanded="true" />
+            <element signature="e#5852#5853#0" expanded="true" />
+            <element signature="e#5888#5889#0" expanded="true" />
+            <element signature="e#5946#5947#0" expanded="true" />
+            <element signature="e#5996#5997#0" expanded="true" />
+            <element signature="e#6067#6068#0" expanded="true" />
+            <element signature="e#6100#6101#0" expanded="true" />
+            <element signature="e#6152#6153#0" expanded="true" />
+            <element signature="e#6196#6197#0" expanded="true" />
+            <element signature="e#6261#6262#0" expanded="true" />
+            <element signature="e#6291#6292#0" expanded="true" />
+            <element signature="e#6337#6338#0" expanded="true" />
+            <element signature="e#6375#6376#0" expanded="true" />
+            <element signature="e#6437#6438#0" expanded="true" />
+            <element signature="e#6467#6468#0" expanded="true" />
+            <element signature="e#6513#6514#0" expanded="true" />
+            <element signature="e#6551#6552#0" expanded="true" />
+            <element signature="e#6613#6614#0" expanded="true" />
+            <element signature="e#6643#6644#0" expanded="true" />
+            <element signature="e#6689#6690#0" expanded="true" />
+            <element signature="e#6727#6728#0" expanded="true" />
+            <element signature="e#6796#6797#0" expanded="true" />
+            <element signature="e#6829#6830#0" expanded="true" />
+            <element signature="e#6881#6882#0" expanded="true" />
+            <element signature="e#6925#6926#0" expanded="true" />
+            <element signature="e#6995#6996#0" expanded="true" />
+            <element signature="e#7030#7031#0" expanded="true" />
+            <element signature="e#7086#7087#0" expanded="true" />
+            <element signature="e#7134#7135#0" expanded="true" />
+            <element signature="e#7202#7203#0" expanded="true" />
+            <element signature="e#7233#7234#0" expanded="true" />
+            <element signature="e#7281#7282#0" expanded="true" />
+            <element signature="e#7321#7322#0" expanded="true" />
+            <element signature="e#7390#7391#0" expanded="true" />
+            <element signature="e#7426#7427#0" expanded="true" />
+            <element signature="e#7484#7485#0" expanded="true" />
+            <element signature="e#7534#7535#0" expanded="true" />
+            <element signature="e#7602#7603#0" expanded="true" />
+            <element signature="e#7636#7637#0" expanded="true" />
+            <element signature="e#7690#7691#0" expanded="true" />
+            <element signature="e#7736#7737#0" expanded="true" />
+            <element signature="e#7806#7807#0" expanded="true" />
+            <element signature="e#7840#7841#0" expanded="true" />
+            <element signature="e#7894#7895#0" expanded="true" />
+            <element signature="e#7940#7941#0" expanded="true" />
+            <element signature="e#8006#8007#0" expanded="true" />
+            <element signature="e#8036#8037#0" expanded="true" />
+            <element signature="e#8082#8083#0" expanded="true" />
+            <element signature="e#8120#8121#0" expanded="true" />
+            <element signature="e#8189#8190#0" expanded="true" />
+            <element signature="e#8226#8227#0" expanded="true" />
+            <element signature="e#8286#8287#0" expanded="true" />
+            <element signature="e#8338#8339#0" expanded="true" />
+            <element signature="e#8417#8418#0" expanded="true" />
+            <element signature="e#8457#8458#0" expanded="true" />
+            <element signature="e#8523#8524#0" expanded="true" />
+            <element signature="e#8581#8582#0" expanded="true" />
+            <element signature="e#8655#8656#0" expanded="true" />
+            <element signature="e#8687#8688#0" expanded="true" />
+            <element signature="e#8737#8738#0" expanded="true" />
+            <element signature="e#8779#8780#0" expanded="true" />
+            <element signature="e#8846#8847#0" expanded="true" />
+            <element signature="e#8879#8880#0" expanded="true" />
+            <element signature="e#8931#8932#0" expanded="true" />
+            <element signature="e#8975#8976#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#787#788#0" expanded="true" />
+            <element signature="e#817#818#0" expanded="true" />
+            <element signature="e#2105#2106#0" expanded="true" />
+            <element signature="e#2135#2136#0" expanded="true" />
+            <element signature="e#2431#2432#0" expanded="true" />
+            <element signature="e#2461#2462#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index 854f1f1..0db633a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -165,12 +165,16 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String startDay,String endDay) {
+    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew) {
         try {
 
             Criteria criteria = createCriteria(PgAlarm.class);
             criteria.addOrder(Order.desc("id"));
 
+            if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) {
+                criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
+            }
+
             if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay))
             {
                 criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay)));
@@ -193,9 +197,11 @@
 
                 criteria.add(Restrictions.le("alarmDate",date));
             }
+            if(StringUtils.isNotBlank(isNew)&&isNew.equals("true"))
+                criteria.add(Restrictions.eq("active", 1));
 
             List<PgAlarm> pgAlarmList = criteria.list();
-            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
     }
 
     //根据设备位置(仓位)获取摄像机列表
-    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+    public List<PgDeviceDto> getPgCameraListByPosition(String partition,String position){
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.like("position",position+"%"));
-//        criteria.add(Restrictions.eq("devType","球机"));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(position))
+            criteria.add(Restrictions.like("position",position+"%"));
+
         criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
 
         List<PgDevice> pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
             dto.setDevCode(objects[5].toString());
             dto.setDevType(objects[6].toString());
             if(objects[7]!=null)
-            dto.setIp(objects[7].toString());
+                dto.setIp(objects[7].toString());
             dto.setIsOpen(objects[8].toString());
             dto.setPartition(objects[11].toString());
             dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index 8ebf74d..3c657a7 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgEquipment;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
 import com.casic.PgInterface.devTable.dto.PgEquipmentDto;
@@ -34,9 +35,12 @@
     public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
-        criteria.add(Restrictions.eq("eqName",eqName));
-        criteria.add(Restrictions.eq("eqCode",eqCode));
-        criteria.add(Restrictions.eq("eqType",eqType));
+        if(StringUtils.isNotBlank(eqName))
+            criteria.add(Restrictions.eq("eqName",eqName));
+        if(StringUtils.isNotBlank(eqCode))
+            criteria.add(Restrictions.eq("eqCode",eqCode));
+        if(StringUtils.isNotBlank(eqType))
+            criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
@@ -51,10 +55,9 @@
 
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
-        //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
         String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
-        +eqType+"' group by equipment.EQ_NAME";
+                +eqType+"' group by equipment.EQ_NAME";
 
         List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4ed68e4..e413a5c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
@@ -39,7 +40,8 @@
 
     public List<PgPipeLineDto> getPipeLineByLineType(String lineType) {
         Criteria criteria = createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineType", lineType));
+        if(StringUtils.isNotBlank(lineType))
+            criteria.add(Restrictions.eq("lineType", lineType));
 
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    private Long id;
-    private String keyId;//巡检记录单id
-    private String planId;//巡检计划ID
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    @Column(name="KEY_ID")
-    public String getKeyId() {
-        return keyId;
-    }
-
-    public void setKeyId(String keyId) {
-        this.keyId = keyId;
-    }
-
-    @Column(name="PLAN_ID")
-    public String getPlanId() {
-        return planId;
-    }
-
-    public void setPlanId(String planId) {
-        this.planId = planId;
-    }
-
-    @Column(name="CREATE_DATE")
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    @Column(name="STATE")
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    @Column(name="CREATOR")
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    @Column(name="PLAN_NAME")
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    @Column(name="RECORD_NO")
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    @Column(name="PLAN_NO")
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    @Column(name="RESPONSIBIE_DEPT")
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    @Column(name="INSPECTION_PERSON")
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    @Column(name="PATROL_MAN")
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    @Column(name="OPERATE_DATE")
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    @Column(name="REMARK")
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Column(name="BUILD_CABIN")
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    @Column(name="PROJECT")
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    @Column(name="START_PILE_NO")
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    @Column(name="END_PILE_NO")
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    @Column(name="INSPECTION_PRACE")
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    @Column(name="OTHER_PATROL_MAN")
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private Long id;
+    private String KEY_ID;//唯一键值
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_PERSON;//巡检人
+    private String START_DATE;//巡检开始时间
+    private String END_DATE;
+    private String FREQUENCY;//巡检频率
+    private String STATE;//状态
+    private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+    private String PLAN_NO;//巡检计划编号
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_MODE;//巡检方式
+    private String INSPECTION_ROUTE;//巡检路线
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String INSPECTION_GROUP;//巡检部门
+    private String INSERT_TIME;//插入时间
+    private String FREQUENCYDATE;//巡检具体日期
+    private String FREQUENCYTIME;//巡检具体时间
+    private String CREATEDATE;//创建时间
+    private String CREATOR;//创建人
+    private String PROJECT;//项目
+    private String COMLILE;//编制人
+    private String START_TIME;//编制时间
+    private String DEVELOP_DEPT;//制定部门
+    private String END_TIME;//结束时间
+    private String START_PILE_NO;//开始桩号
+    private String END_PILE_NO;//结束桩号
+    private String BUILD_CABIN;//巡检舱室
+    private String MILEAGE;
+    private String FREQUENCY_TIME;//巡检具体时间
+    private String FREQUENCYTIME_END;
+    private String KETTLE_TS;
+    private String UPDATEDATE;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="KEY_ID")
+    public String getKEY_ID() {
+        return KEY_ID;
+    }
+
+    public void setKEY_ID(String KEY_ID) {
+        this.KEY_ID = KEY_ID;
+    }
+
+    @Column(name="PLAN_NAME")
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    @Column(name="INSPECTION_PERSON")
+    public String getINSPECTION_PERSON() {
+        return INSPECTION_PERSON;
+    }
+
+    public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+        this.INSPECTION_PERSON = INSPECTION_PERSON;
+    }
+
+    @Column(name="START_DATE")
+    public String getSTART_DATE() {
+        return START_DATE;
+    }
+
+    public void setSTART_DATE(String START_DATE) {
+        this.START_DATE = START_DATE;
+    }
+
+    @Column(name="END_DATE")
+    public String getEND_DATE() {
+        return END_DATE;
+    }
+
+    public void setEND_DATE(String END_DATE) {
+        this.END_DATE = END_DATE;
+    }
+
+    @Column(name="FREQUENCY")
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    @Column(name="STATE")
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    @Column(name="RESPONSIBLE_DEPT")
+    public String getRESPONSIBLE_DEPT() {
+        return RESPONSIBLE_DEPT;
+    }
+
+    public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+        this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+    }
+
+    @Column(name="PLAN_NO")
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    @Column(name="INSPECTION_TYPE")
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    @Column(name="INSPECTION_MODE")
+    public String getINSPECTION_MODE() {
+        return INSPECTION_MODE;
+    }
+
+    public void setINSPECTION_MODE(String INSPECTION_MODE) {
+        this.INSPECTION_MODE = INSPECTION_MODE;
+    }
+
+    @Column(name="INSPECTION_ROUTE")
+    public String getINSPECTION_ROUTE() {
+        return INSPECTION_ROUTE;
+    }
+
+    public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+        this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+    }
+
+    @Column(name="INSPECTION_START_TIME")
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    @Column(name="INSPECTION_END_TIME")
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    @Column(name="INSPECTION_PRACE")
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    @Column(name="INSPECTION_GROUP")
+    public String getINSPECTION_GROUP() {
+        return INSPECTION_GROUP;
+    }
+
+    public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+        this.INSPECTION_GROUP = INSPECTION_GROUP;
+    }
+
+    @Column(name="INSERT_TIME")
+    public String getINSERT_TIME() {
+        return INSERT_TIME;
+    }
+
+    public void setINSERT_TIME(String INSERT_TIME) {
+        this.INSERT_TIME = INSERT_TIME;
+    }
+
+    @Column(name="FREQUENCYDATE")
+    public String getFREQUENCYDATE() {
+        return FREQUENCYDATE;
+    }
+
+    public void setFREQUENCYDATE(String FREQUENCYDATE) {
+        this.FREQUENCYDATE = FREQUENCYDATE;
+    }
+
+    @Column(name="FREQUENCYTIME")
+    public String getFREQUENCYTIME() {
+        return FREQUENCYTIME;
+    }
+
+    public void setFREQUENCYTIME(String FREQUENCYTIME) {
+        this.FREQUENCYTIME = FREQUENCYTIME;
+    }
+
+    @Column(name="CREATEDATE")
+    public String getCREATEDATE() {
+        return CREATEDATE;
+    }
+
+    public void setCREATEDATE(String CREATEDATE) {
+        this.CREATEDATE = CREATEDATE;
+    }
+
+    @Column(name="CREATOR")
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    @Column(name="PROJECT")
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    @Column(name="COMLILE")
+    public String getCOMLILE() {
+        return COMLILE;
+    }
+
+    public void setCOMLILE(String COMLILE) {
+        this.COMLILE = COMLILE;
+    }
+
+    @Column(name="START_TIME")
+    public String getSTART_TIME() {
+        return START_TIME;
+    }
+
+    public void setSTART_TIME(String START_TIME) {
+        this.START_TIME = START_TIME;
+    }
+
+    @Column(name="DEVELOP_DEPT")
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    @Column(name="END_TIME")
+    public String getEND_TIME() {
+        return END_TIME;
+    }
+
+    public void setEND_TIME(String END_TIME) {
+        this.END_TIME = END_TIME;
+    }
+
+    @Column(name="START_PILE_NO")
+    public String getSTART_PILE_NO() {
+        return START_PILE_NO;
+    }
+
+    public void setSTART_PILE_NO(String START_PILE_NO) {
+        this.START_PILE_NO = START_PILE_NO;
+    }
+
+    @Column(name="END_PILE_NO")
+    public String getEND_PILE_NO() {
+        return END_PILE_NO;
+    }
+
+    public void setEND_PILE_NO(String END_PILE_NO) {
+        this.END_PILE_NO = END_PILE_NO;
+    }
+
+    @Column(name="BUILD_CABIN")
+    public String getBUILD_CABIN() {
+        return BUILD_CABIN;
+    }
+
+    public void setBUILD_CABIN(String BUILD_CABIN) {
+        this.BUILD_CABIN = BUILD_CABIN;
+    }
+
+    @Column(name="MILEAGE")
+    public String getMILEAGE() {
+        return MILEAGE;
+    }
+
+    public void setMILEAGE(String MILEAGE) {
+        this.MILEAGE = MILEAGE;
+    }
+
+    @Column(name="FREQUENCY_TIME")
+    public String getFREQUENCY_TIME() {
+        return FREQUENCY_TIME;
+    }
+
+    public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+        this.FREQUENCY_TIME = FREQUENCY_TIME;
+    }
+
+    @Column(name="FREQUENCYTIME_END")
+    public String getFREQUENCYTIME_END() {
+        return FREQUENCYTIME_END;
+    }
+
+    public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+        this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+    }
+
+    @Column(name="KETTLE_TS")
+    public String getKETTLE_TS() {
+        return KETTLE_TS;
+    }
+
+    public void setKETTLE_TS(String KETTLE_TS) {
+        this.KETTLE_TS = KETTLE_TS;
+    }
+
+    @Column(name="UPDATEDATE")
+    public String getUPDATEDATE() {
+        return UPDATEDATE;
+    }
+
+    public void setUPDATEDATE(String UPDATEDATE) {
+        this.UPDATEDATE = UPDATEDATE;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 5346b57..2f8d359 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -66,7 +66,7 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REPAIRMAN")
+    @Column(name="REOAIRMAN")
     public String getRepairMan() {
         return repairMan;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
-    private Long id;
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-
-
-    public static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
-        PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
-        pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
-        pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
-        pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
-        pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
-        pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
-        pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
-        pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
-        pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
-        pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
-        pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
-        pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
-        pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
-        pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
-        pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
-        return pgAssetInSpectionRecordDto;
-    }
-
-
-    public static List<PgAssetInSpectionRecordDto> ConvertToDtoList(List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList){
-        List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-        for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
-            pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
-        }
-
-        return pgAssetInSpectionRecordDtoList;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
-    private String num;
-    private String createDate;
-
-    public String getNum() {
-        return num;
-    }
-
-    public void setNum(String num) {
-        this.num = num;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+    private Long id;
+    private String PLAN_NO;//巡检计划编号
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String FREQUENCY;//巡检频率
+    private String CREATOR;//创建人
+    private String DEVELOP_DEPT;//制定部门
+    private String PROJECT;//项目
+    private String STATE;//状态
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+        PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+        pgAssetPlanDto.setId(pgAssetPlan.getId());
+        pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+        pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+        pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+        pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+        pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+        pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+        pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+        pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+        pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+        pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+        pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+        return pgAssetPlanDto;
+    }
+
+    public static List<PgAssetPlanDto> ConvertToPgAssetDtoList(List<PgAssetPlan> pgAssetPlanList){
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
+
+        for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+            pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+        }
+
+        return pgAssetPlanDtoList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
new file mode 100644
index 0000000..bc12db1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
@@ -0,0 +1,24 @@
+package com.casic.PgInterface.maintenance.dto;
+
+public class PgAssetPlanStatic {
+
+    private String num;
+    private String createDate;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
deleted file mode 100644
index c41ca7d..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.casic.PgInterface.maintenance.manager;
-
-import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
-
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
-        try {
-            String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
-                    "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
-                    "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-
-            if(patrolMan!=null)
-                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
-            if(startTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
-            if(endTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')<to_date('"+endTime+"','yyyy-MM-dd')";
-
-            sql+=" order by id";
-
-            List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
-
-            List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList=new ArrayList<>();
-            for(Object[] objects1:objects){
-                PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord();
-
-                pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString()));
-                pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1]));
-                pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2]));
-                pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3]));
-                pgAssetInSpectionRecord.setState(String.valueOf(objects1[4]));
-                pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5]));
-                pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6]));
-                pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7]));
-                pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8]));
-                pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9]));
-                pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10]));
-                pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11]));
-                pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12]));
-                pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13]));
-                pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14]));
-                pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15]));
-                pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16]));
-                pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17]));
-                pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18]));
-                pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19]));
-
-                pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord);
-            }
-
-            List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-            for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList)
-            {
-                pgAssetInSpectionRecordDtoList.add(PgAssetInSpectionRecordDto.ConvertToDto(pgAssetInSpectionRecord));
-            }
-
-            return pgAssetInSpectionRecordDtoList;
-        }
-        catch(Exception e)
-        {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public List<PgAssetInSpectionRecordStatic> getPgAssetInSpectionRecordStaticLisByTime(
-            String startTime, String endTime, String staticType) {
-
-        String sql="";
-        String dateType="";
-        List<PgAssetInSpectionRecordStatic> pgAssetInSpectionRecordStaticList=new ArrayList<>();
-        int type=Integer.valueOf(staticType);
-
-        switch(type) {
-            case 0://年
-                dateType = "yyyy";
-                break;
-            case 1://月
-                dateType = "yyyy-mm";
-                break;
-            case 2://周
-                dateType = "iw";
-                break;
-            case 3://日
-                dateType="yyyy-mm-dd";
-                break;
-            default:
-                break;
-        }
-
-        sql="select count(*), to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_RECORD t where 1=1";
-
-        if(startTime!=null)
-            sql+=" and t.CREATE_DATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
-        if(endTime!=null)
-            sql+=" and t.CREATE_DATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
-
-        sql+=" group by to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"')";
-
-        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
-        for(int i=0;i<objects.size();i++)
-        {
-            PgAssetInSpectionRecordStatic pgAssetInSpectionRecordStatic=new PgAssetInSpectionRecordStatic();
-            pgAssetInSpectionRecordStatic.setNum(objects.get(i)[0].toString());
-            pgAssetInSpectionRecordStatic.setCreateDate(objects.get(i)[1].toString());
-            pgAssetInSpectionRecordStaticList.add(pgAssetInSpectionRecordStatic);
-        }
-        return pgAssetInSpectionRecordStaticList;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
new file mode 100644
index 0000000..bb6bf1e
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
@@ -0,0 +1,81 @@
+package com.casic.PgInterface.maintenance.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgAssetPlanManager extends HibernateEntityDao<PgAssetPlan> {
+
+    public List<PgAssetPlanDto> getPgAssetPlanDtoList(String inSpectionPlace){
+        Criteria criteria=createCriteria(PgAssetPlan.class);
+
+        if(StringUtils.isNotBlank(inSpectionPlace))
+            criteria.add(Restrictions.like("INSPECTION_PRACE","%"+inSpectionPlace+"%"));
+        criteria.addOrder(Order.desc("id"));
+
+        List<PgAssetPlan> pgAssetPlanList=criteria.list();
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=PgAssetPlanDto.ConvertToPgAssetDtoList(pgAssetPlanList);
+
+        if(pgAssetPlanDtoList==null||pgAssetPlanDtoList.size()==0)
+            return null;
+        else
+            return pgAssetPlanDtoList;
+    }
+
+    public List<PgAssetPlanStatic> getPgAssetPlanStaticLisByTime(
+            String startTime, String endTime, String staticType) {
+
+        String sql="";
+        String dateType="";
+        List<PgAssetPlanStatic> pgAssetPlanStaticList=new ArrayList<>();
+        int type=Integer.valueOf(staticType);
+
+        switch(type) {
+            case 0://年
+                dateType = "yyyy";
+                break;
+            case 1://月
+                dateType = "yyyy-mm";
+                break;
+            case 2://周
+                dateType = "iw";
+                break;
+            case 3://日
+                dateType="yyyy-mm-dd";
+                break;
+            default:
+                break;
+        }
+
+        sql="select count(*), to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_PLAN t where 1=1";
+
+        if(startTime!=null)
+            sql+=" and t.CREATEDATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
+        if(endTime!=null)
+            sql+=" and t.CREATEDATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
+
+        sql+=" group by to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"')";
+
+        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
+        for(int i=0;i<objects.size();i++)
+        {
+            PgAssetPlanStatic pgAssetPlanStatic=new PgAssetPlanStatic();
+            pgAssetPlanStatic.setNum(objects.get(i)[0].toString());
+            pgAssetPlanStatic.setCreateDate(objects.get(i)[1].toString());
+            pgAssetPlanStaticList.add(pgAssetPlanStatic);
+        }
+        return pgAssetPlanStaticList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 0903f22..3484739 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -15,7 +15,7 @@
 
     public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
             if(repairMan!=null)
                 sql+=" and REPAIRMAN like '%"+repairMan+"%'";
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index 9cc2881..6d90d7b 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -1,5 +1,7 @@
 package com.casic.PgInterface.patroler.dto;
 
+import com.casic.PgInterface.devTable.domain.PgDevice;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 
 /**
@@ -14,6 +16,7 @@
     private String unit;//单位
     private String alarmType;//报警类型
     private Long pgDeviceId;//设备编号
+    private String assetCode;//资产编号
 
     public Long getId() {
         return id;
@@ -71,7 +74,15 @@
         this.pgDeviceId = pgDeviceId;
     }
 
-    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
+    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule, PgDeviceManager pgDeviceManager) {
         this.setId(pgAlarmRule.getId());
         this.setHighValue(pgAlarmRule.getHighValue());
         this.setLowValue(pgAlarmRule.getLowValue());
@@ -82,6 +93,10 @@
         else
             this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
         this.setPgDeviceId(pgAlarmRule.getPgDeviceId());
+        if(pgAlarmRule.getAlarmTypeId()!=null&&pgDeviceManager.get(pgAlarmRule.getPgDeviceId())!=null)
+            this.setAssetCode(pgDeviceManager.get(pgAlarmRule.getPgDeviceId()).getAssetCode());
+        else
+            this.setAssetCode("");
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
index c132c98..a7cef5b 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
@@ -1,13 +1,17 @@
 package com.casic.PgInterface.patroler.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.ResponseStatus;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -17,30 +21,23 @@
 @Service
 public class PgAlarmRuleManager extends HibernateEntityDao<PgAlarmRule> {
 
+    @Resource
+    private PgDeviceManager pgDeviceManager;
+
     //根据设备获取设备报警阈值
-    public List<PgAlarmRuleDto>  getAlarmRuleDto() {
+    public List<PgAlarmRuleDto>  getAlarmRuleDto(String devType) {
         Criteria criteria=createCriteria(PgAlarmRule.class);
+
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.eq("devType", devType));
         criteria.addOrder(Order.desc("id"));
 
         List<PgAlarmRule> pgAlarmRuleList=criteria.list();
-        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
+        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         for (PgAlarmRule pgAlarmRule : pgAlarmRuleList) {
-            pgAlarmRuleDtoList.add(new PgAlarmRuleDto(pgAlarmRule));
+            pgAlarmRuleDtoList.add(new PgAlarmRuleDto(pgAlarmRule,pgDeviceManager));
         }
         return pgAlarmRuleDtoList;
-
     }
 
-    public PgAlarmRule getAlarmRuleBydevType(String devType) {
-        Criteria criteria=createCriteria(PgAlarmRule.class);
-        criteria.add(Restrictions.eq("devType", devType));
-
-        List<PgAlarmRule> pgAlarmRuleList=criteria.list();
-
-        if(pgAlarmRuleList==null||pgAlarmRuleList.size()==0)
-            return null;
-        else
-            return pgAlarmRuleList.get(0);
-    }
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index d0e28f5..082ba5d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgAlarm;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
@@ -39,7 +40,7 @@
     private PgReservePlanManager pgReservePlanManager;
 
     /*
-    * 获取报警设备信息
+     * 获取报警设备信息
      */
     @POST
     @Path("linkDevice")
@@ -50,11 +51,22 @@
 
         PgDeviceDto pgDeviceDto = null;
         try {
-            PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
-            PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
-
-            pgDeviceDto=new PgDeviceDto(pgDevice);
-            msg = "报警关联设备获取成功";
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if (pgAlarm == null)
+                    msg = "不存在报警信息";
+                else {
+                    PgDevice pgDevice = pgAlarm.getAlarmDevId();
+                    if (pgDevice == null)
+                        msg = "不存在报警设备";
+                    else {
+                        pgDeviceDto = new PgDeviceDto(pgDevice);
+                        msg = "报警关联设备获取成功";
+                    }
+                }
+            }
+            else
+                msg="未接受到报警设备ID信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取关联设备失败";
@@ -77,11 +89,28 @@
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
-            PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
-            PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
-            pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if(pgAlarm==null)
+                    msg="不存在报警信息";
+                else {
+                    PgDevice pgDevice = pgAlarm.getAlarmDevId();
+                    if (pgDevice == null)
+                        msg = "不存在报警设备";
+                    else {
+                        String strPosition=pgDevice.getPosition();
+                        String position="";
+                        if(!strPosition.equals(""))
+                            position=pgDevice.getPosition().substring(0,3);
+                        String partition=pgDevice.getPartition();
 
-            msg = "关联设备获取成功";
+                        pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
+                        msg = "关联设备获取成功";
+                    }
+                }
+            }
+            else
+                msg="请输入报警设备Id信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "分区设备关联失败";
@@ -93,7 +122,7 @@
 
     /*
      * 根据报警记录获取关联的预案
-    */
+     */
     @POST
     @Path("linkReservePlan")
     @Produces(MediaType.APPLICATION_JSON)
@@ -103,10 +132,21 @@
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
-            PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
-            pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if (pgAlarm == null)
+                    msg = "不存在报警信息";
+                else {
+                    pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-            msg="关联预案获取成功";
+                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
+                        msg="不存在关联的报警预案";
+                    else
+                        msg = "关联预案获取成功";
+                }
+            }
+            else
+                msg="请输入报警信息";
         }
         catch(Exception e)
         {
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index d18ebb8..baacd93 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -48,14 +48,16 @@
     @POST
     @Path("getAlarmInfo")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmList(@FormParam("startDay") String startDay,
-                                            @FormParam("endDay") String endDay) throws Exception {
+    public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
+                                            @FormParam("startDay") String startDay,
+                                            @FormParam("endDay") String endDay,
+                                            @FormParam("isNew") String isNew) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(startDay,endDay);
-            if (pgAlarmDtoList.size() == 0)
+            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew);
+            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
                 msg = "没有报警信息";
             else
                 msg = "报警信息获取成功";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 87afd54..29ce8a4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -1,7 +1,5 @@
 package com.casic.PgInterface.rs;
 
-import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager;
-import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import com.casic.PgInterface.patroler.manager.PgAlarmRuleManager;
@@ -30,119 +28,23 @@
     private static Logger logger = LoggerFactory.getLogger(PgAlarmRule.class);
 
     @Resource
-    private PgDeviceManager pgDeviceManager;
-    @Resource
-    private PgAlarmTypeManager pgAlarmTypeManager;
-    @Resource
     private PgAlarmRuleManager pgAlarmRuleManager;
 
-
-
-    /**
-     * 新增报警阈值
-     */
-    @POST
-    @Path("addAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> addAlarmRule(@FormParam("highValue") String highValue,
-                                            @FormParam("lowValue") String lowValue,
-                                            @FormParam("unit") String unit,
-                                            @FormParam("devType") String devType,
-                                            @FormParam("alarmType") String alarmType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType);
-            if (pgAlarmRule != null) {
-                result = "false";
-                msg = "设备阈值已经存在";
-            } else {
-                pgAlarmRule = new PgAlarmRule();
-                pgAlarmRule.setHighValue(highValue);
-                pgAlarmRule.setLowValue(lowValue);
-                pgAlarmRule.setDevType(devType);
-                pgAlarmRule.setUnit(unit);
-                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
-
-                pgAlarmRuleManager.save(pgAlarmRule);
-                result = "true";
-                msg = "报警阈值新增成功";
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = "false";
-            msg = "报警阈值新增失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-        return resultMap;
-    }
-
-    /**
-     * 编辑报警阈值
-     */
-    @POST
-    @Path("editAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> editAlarmRule(@FormParam("id") String id,
-                                             @FormParam("devType") String devType,
-                                             @FormParam("highValue") String highValue,
-                                             @FormParam("lowValue") String lowValue,
-                                             @FormParam("unit") String unit,
-                                             @FormParam("alarmType") String alarmType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
-            if (pgAlarmRule == null) {
-                msg = "不存在报警阈值记录";
-                result = "false";
-            } else {
-                pgAlarmRule.setDevType(devType);
-                pgAlarmRule.setHighValue(highValue);
-                pgAlarmRule.setLowValue(lowValue);
-                pgAlarmRule.setUnit(unit);
-                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
-
-                pgAlarmRuleManager.save(pgAlarmRule);
-                msg = "编辑成功";
-                result = "true";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            result = "false";
-            msg = "报警阈值编辑失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-
-        return resultMap;
-    }
-
     /**
      * 获取报警阈值信息
      */
     @POST
     @Path("getAlarmRule")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmRule() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+    public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
+        System.out.println("devType:"+devType);
+        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
-            pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto();
-            if (pgAlarmRuleDtoList == null)
+            pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
+            if (pgAlarmRuleDtoList == null||pgAlarmRuleDtoList.size()==0)
                 msg = "不存在报警阈值信息";
             else
                 msg = "报警阈值获取成功";
@@ -155,69 +57,4 @@
         return resultMap;
     }
 
-    /**
-     * 删除报警阈值
-     */
-    @POST
-    @Path("deleteAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> deleteAlarmRule(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
-            if (pgAlarmRule == null) {
-                msg = "不存在报警阈值记录";
-                result = "false";
-            } else {
-                pgAlarmRuleManager.remove(pgAlarmRule);
-                msg = "删除成功";
-                result = "true";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            result = "false";
-            msg = "报警阈值删除失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-
-        return resultMap;
-    }
-
-    /**
-     * 根据设备类型报警阈值
-     */
-    @POST
-    @Path("getAlarmRuleByDevType")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmRuleByDevType(@FormParam("devType") String devType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        PgAlarmRule pgAlarmRule = null;
-        List<PgAlarmRuleDto> pgAlarmRuleDtos = new ArrayList<>();
-        try {
-            pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType);
-            if (pgAlarmRule == null)
-                msg = "不存在报警阈值记录";
-            else {
-                PgAlarmRuleDto pgAlarmRuleDto= new PgAlarmRuleDto(pgAlarmRule);
-                pgAlarmRuleDtos.add(pgAlarmRuleDto);
-                msg = "报警阈值获取成功";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            msg = "报警阈值获取失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmRuleDtos);
-
-        return resultMap;
-    }
-
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
new file mode 100644
index 0000000..19d3b8c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanRs")
+public class PgAssetPlanRs {
+
+    @Resource
+    private PgAssetPlanManager pgAssetPlanManager;
+
+    /**
+     * 获取巡检记录
+     */
+    @POST
+    @Path("getPgAssetPlanList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPgAssetPlanList(@FormParam("inSpectionPlace") String inSpectionPlace){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
+        try{
+            pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(inSpectionPlace);
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
+                msg="巡检信息获取成功";
+            else
+                msg="不存在巡检信息";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="巡检信息获取失败";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAssetPlanDtoList);
+
+        return resultMap;
+    }
+}

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ff69e2a..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,27 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190828.docx" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -32,72 +42,119 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="2" />
-          <entry key="java" value="243" />
-          <entry key="properties" value="6" />
+          <entry key="java" value="321" />
+          <entry key="properties" value="8" />
           <entry key="xml" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
-          <entry key="JAVA" value="243" />
-          <entry key="Properties" value="6" />
+          <entry key="JAVA" value="321" />
+          <entry key="Properties" value="8" />
           <entry key="XML" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="8082" />
-          <entry key="properties" value="49" />
-          <entry key="txt" value="64" />
+          <entry key="dummy" value="16" />
+          <entry key="java" value="10723" />
+          <entry key="properties" value="59" />
+          <entry key="txt" value="118" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="8082" />
-          <entry key="PLAIN_TEXT" value="64" />
-          <entry key="Properties" value="49" />
+          <entry key="JAVA" value="10723" />
+          <entry key="PLAIN_TEXT" value="134" />
+          <entry key="Properties" value="59" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="4" />
+          <entry key="project.closed" value="28" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
           <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.24" value="1" />
+          <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="1" />
-          <entry key="project.open.time.3" value="3" />
-          <entry key="project.open.time.31" value="1" />
+          <entry key="project.open.time.28" value="1" />
+          <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.31" value="2" />
           <entry key="project.open.time.37" value="1" />
+          <entry key="project.open.time.39" value="2" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.40" value="1" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="1" />
+          <entry key="project.open.time.44" value="2" />
           <entry key="project.open.time.45" value="2" />
           <entry key="project.open.time.48" value="1" />
           <entry key="project.open.time.49" value="1" />
+          <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.58" value="1" />
           <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.71" value="1" />
+          <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.71" value="2" />
           <entry key="project.open.time.76" value="1" />
-          <entry key="project.opened" value="25" />
+          <entry key="project.opened" value="41" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+            <state relative-caret-position="174">
+              <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
               <folding>
-                <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-                <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="352">
+              <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#787#788#0" expanded="true" />
+                <element signature="e#817#818#0" expanded="true" />
+                <element signature="e#2105#2106#0" expanded="true" />
+                <element signature="e#2135#2136#0" expanded="true" />
+                <element signature="e#2431#2432#0" expanded="true" />
+                <element signature="e#2461#2462#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="638">
+              <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+              <folding>
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -122,6 +179,7 @@
       <find>getPgDeviceByDevType</find>
       <find>message</find>
       <find>getConstructionByType</find>
+      <find>getPgCameraListByPosition</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -130,24 +188,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanTypeDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
@@ -162,17 +207,38 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
       </list>
     </option>
   </component>
@@ -208,16 +274,18 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="3" />
-    <option name="y" value="10" />
-    <option name="width" value="1386" />
-    <option name="height" value="788" />
+    <option name="x" value="1410" />
+    <option name="y" value="117" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -258,7 +326,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -267,16 +335,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -286,7 +345,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="dto" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -296,7 +355,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="manager" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -308,19 +367,10 @@
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="webapp" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -359,6 +409,7 @@
       </deployment>
       <server-settings>
         <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_7" />
+        <option name="JNDI_PORT" value="10991" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -456,7 +507,23 @@
       <workItem from="1566350810712" duration="6803000" />
       <workItem from="1566435787074" duration="10717000" />
       <workItem from="1566521753529" duration="14265000" />
-      <workItem from="1566614176989" duration="5693000" />
+      <workItem from="1566614176989" duration="14059000" />
+      <workItem from="1566780822009" duration="1026000" />
+      <workItem from="1566891563975" duration="284000" />
+      <workItem from="1566893107340" duration="3382000" />
+      <workItem from="1566953794976" duration="11039000" />
+      <workItem from="1567059357700" duration="484000" />
+      <workItem from="1567082835097" duration="1086000" />
+      <workItem from="1567126428020" duration="1539000" />
+      <workItem from="1567129277820" duration="5788000" />
+      <workItem from="1567136008996" duration="2568000" />
+      <workItem from="1567237040302" duration="111000" />
+      <workItem from="1567495626345" duration="2797000" />
+      <workItem from="1567558770152" duration="2352000" />
+      <workItem from="1567577368149" duration="640000" />
+      <workItem from="1567751224608" duration="780000" />
+      <workItem from="1568019299799" duration="695000" />
+      <workItem from="1568082566133" duration="4016000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -493,17 +560,60 @@
       <option name="project" value="LOCAL" />
       <updated>1566553388171</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="整理管线部分">
+      <created>1566620046627</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1566620046627</updated>
+    </task>
+    <task id="LOCAL-00007" summary="合并代码提交">
+      <created>1566781001910</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1566781001910</updated>
+    </task>
+    <task id="LOCAL-00008" summary="合并代码提交">
+      <created>1566963831930</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1566963831930</updated>
+    </task>
+    <task id="LOCAL-00009" summary="修改报警阈值">
+      <created>1566972146710</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1566972146710</updated>
+    </task>
+    <task id="LOCAL-00010" summary="修改巡检维护表字段">
+      <created>1567126525554</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1567126525554</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="142930000" />
+    <option name="totallyTimeSpent" value="189883000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
+    <frame x="1358" y="-8" width="1456" height="916" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29297996" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -511,13 +621,14 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Thumbnails" weight="0.3295082" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.5081967" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.3849105" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
       <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
       <window_info anchor="bottom" id="Spring" order="8" />
       <window_info anchor="bottom" id="Terminal" order="9" />
@@ -539,7 +650,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2193646" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -547,22 +658,23 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.47540984" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
-      <window_info anchor="bottom" id="Spring" order="8" />
-      <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
-      <window_info anchor="bottom" id="Statistic" order="11" />
-      <window_info anchor="bottom" id="Java Enterprise" order="12" />
-      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="14" weight="0.32786885" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.52307695" />
+      <window_info anchor="bottom" id="Thumbnails" order="0" weight="0.3295082" />
+      <window_info anchor="bottom" id="Message" order="1" />
+      <window_info anchor="bottom" id="Find" order="2" />
+      <window_info anchor="bottom" id="Run" order="3" />
+      <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.49924356" weight="0.49344262" />
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Application Servers" order="8" weight="0.3276923" />
+      <window_info anchor="bottom" id="Spring" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
+      <window_info anchor="bottom" id="Statistic" order="12" />
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <window_info anchor="bottom" id="Database Changes" order="14" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="15" weight="0.32786885" />
+      <window_info anchor="bottom" id="Messages" order="16" weight="0.5229508" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -578,6 +690,16 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -587,7 +709,11 @@
     <MESSAGE value="修改权限问题" />
     <MESSAGE value="修改人员登录返回接口" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整理管线部分" />
+    <MESSAGE value="合并代码提交" />
+    <MESSAGE value="修改报警阈值" />
+    <MESSAGE value="修改巡检维护表字段" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护表字段" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -602,322 +728,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-532">
-          <caret line="50" column="28" lean-forward="true" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="19" column="60" selection-start-line="19" selection-start-column="60" selection-end-line="19" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="100" column="34" lean-forward="true" selection-start-line="100" selection-start-column="34" selection-end-line="100" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1474">
-          <caret line="84" column="58" selection-start-line="84" selection-start-column="58" selection-end-line="84" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1100">
-          <caret line="58" column="18" selection-start-line="58" selection-start-column="18" selection-end-line="58" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6842">
-          <caret line="329" selection-start-line="329" selection-end-line="329" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="102" column="24" lean-forward="true" selection-start-line="102" selection-start-column="24" selection-end-line="102" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="72" column="56" lean-forward="true" selection-start-line="72" selection-start-column="56" selection-end-line="72" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="90" column="39" lean-forward="true" selection-start-line="90" selection-start-column="39" selection-end-line="90" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="97" column="16" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
-          <caret line="14" column="52" lean-forward="true" selection-start-line="14" selection-start-column="52" selection-end-line="14" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="26" column="34" lean-forward="true" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="61" column="1" lean-forward="true" selection-start-line="61" selection-start-column="1" selection-end-line="61" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="208" column="49" lean-forward="true" selection-start-line="208" selection-start-column="49" selection-end-line="208" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="140" column="57" selection-start-line="140" selection-start-column="57" selection-end-line="140" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="111" column="36" selection-start-line="111" selection-start-column="36" selection-end-line="111" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="3" lean-forward="true" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="81" column="58" lean-forward="true" selection-start-line="81" selection-start-column="58" selection-end-line="81" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="472">
-          <caret line="118" column="59" selection-start-line="118" selection-start-column="59" selection-end-line="118" selection-end-column="59" />
-          <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-198">
-          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="69" column="32" lean-forward="true" selection-start-line="69" selection-start-column="32" selection-end-line="70" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="142" column="59" lean-forward="true" selection-start-line="142" selection-start-column="59" selection-end-line="142" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="349" column="9" lean-forward="true" selection-start-line="349" selection-start-column="9" selection-end-line="349" selection-end-column="9" />
-          <folding>
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="e#12105#12121#0" expanded="true" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-686">
-          <caret line="67" column="31" lean-forward="true" selection-start-line="67" selection-start-column="31" selection-end-line="67" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="93" column="24" lean-forward="true" selection-start-line="93" selection-start-column="24" selection-end-line="93" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="57" column="23" lean-forward="true" selection-start-line="57" selection-start-column="23" selection-end-line="57" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-408">
-          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="98" column="40" lean-forward="true" selection-start-line="98" selection-start-column="40" selection-end-line="98" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="572">
@@ -925,13 +735,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="328" column="32" lean-forward="true" selection-start-line="328" selection-start-column="32" selection-end-line="328" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
@@ -950,16 +753,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="396">
           <caret line="23" column="32" lean-forward="true" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
-          <folding>
-            <element signature="e#2635#2636#0" expanded="true" />
-            <element signature="e#2671#2672#0" expanded="true" />
-            <element signature="e#2727#2728#0" expanded="true" />
-            <element signature="e#2777#2778#0" expanded="true" />
-            <element signature="e#2877#2878#0" expanded="true" />
-            <element signature="e#2911#2912#0" expanded="true" />
-            <element signature="e#2963#2964#0" expanded="true" />
-            <element signature="e#3009#3010#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -972,14 +765,481 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+        <state relative-caret-position="66">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="59" column="46" lean-forward="true" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3586">
+          <caret line="179" column="16" selection-start-line="179" selection-start-column="16" selection-end-line="179" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5478">
+          <caret line="273" column="3" selection-start-line="273" selection-start-column="3" selection-end-line="273" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1870">
+          <caret line="147" column="11" selection-start-line="147" selection-start-column="11" selection-end-line="147" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="55" column="15" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="106">
+          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="290" column="41" lean-forward="true" selection-start-line="290" selection-start-column="41" selection-end-line="290" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="21" column="32" lean-forward="true" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="550">
+          <caret line="38" column="89" selection-start-line="38" selection-start-column="89" selection-end-line="38" selection-end-column="89" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="11" column="28" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1166">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="818">
+          <caret line="285" column="13" lean-forward="true" selection-start-line="285" selection-start-column="13" selection-end-line="285" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="129" column="31" lean-forward="true" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="323" column="72" lean-forward="true" selection-start-line="323" selection-start-column="72" selection-end-line="323" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="44" column="13" lean-forward="true" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-638">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="244">
+          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="157">
+          <caret line="16" column="55" lean-forward="true" selection-start-line="16" selection-start-column="55" selection-end-line="16" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="270" column="33" lean-forward="true" selection-start-line="270" selection-start-column="33" selection-end-line="270" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="490">
+          <caret line="141" selection-start-line="141" selection-end-line="141" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="164" column="5" lean-forward="true" selection-start-line="164" selection-start-column="5" selection-end-line="164" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/apiTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-242">
+          <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="61" column="16" lean-forward="true" selection-start-line="61" selection-start-column="16" selection-end-line="61" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="700">
+          <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="12" column="34" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="39" column="9" lean-forward="true" selection-start-line="39" selection-start-column="9" selection-end-line="39" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="32" column="29" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="29" />
           <folding>
-            <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-            <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#1838#1839#0" expanded="true" />
+            <element signature="e#1863#1864#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1925#1926#0" expanded="true" />
+            <element signature="e#1822#1823#0" expanded="true" />
+            <element signature="e#1851#1852#0" expanded="true" />
+            <element signature="e#1895#1896#0" expanded="true" />
+            <element signature="e#1931#1932#0" expanded="true" />
+            <element signature="e#2132#2133#0" expanded="true" />
+            <element signature="e#2164#2165#0" expanded="true" />
+            <element signature="e#2214#2215#0" expanded="true" />
+            <element signature="e#2256#2257#0" expanded="true" />
+            <element signature="e#2330#2331#0" expanded="true" />
+            <element signature="e#2370#2371#0" expanded="true" />
+            <element signature="e#2436#2437#0" expanded="true" />
+            <element signature="e#2494#2495#0" expanded="true" />
+            <element signature="e#2569#2570#0" expanded="true" />
+            <element signature="e#2602#2603#0" expanded="true" />
+            <element signature="e#2654#2655#0" expanded="true" />
+            <element signature="e#2698#2699#0" expanded="true" />
+            <element signature="e#2764#2765#0" expanded="true" />
+            <element signature="e#2795#2796#0" expanded="true" />
+            <element signature="e#2843#2844#0" expanded="true" />
+            <element signature="e#2883#2884#0" expanded="true" />
+            <element signature="e#2948#2949#0" expanded="true" />
+            <element signature="e#2980#2981#0" expanded="true" />
+            <element signature="e#3030#3031#0" expanded="true" />
+            <element signature="e#3072#3073#0" expanded="true" />
+            <element signature="e#3134#3135#0" expanded="true" />
+            <element signature="e#3162#3163#0" expanded="true" />
+            <element signature="e#3204#3205#0" expanded="true" />
+            <element signature="e#3238#3239#0" expanded="true" />
+            <element signature="e#3307#3308#0" expanded="true" />
+            <element signature="e#3346#3347#0" expanded="true" />
+            <element signature="e#3410#3411#0" expanded="true" />
+            <element signature="e#3466#3467#0" expanded="true" />
+            <element signature="e#3537#3538#0" expanded="true" />
+            <element signature="e#3567#3568#0" expanded="true" />
+            <element signature="e#3613#3614#0" expanded="true" />
+            <element signature="e#3651#3652#0" expanded="true" />
+            <element signature="e#3721#3722#0" expanded="true" />
+            <element signature="e#3759#3760#0" expanded="true" />
+            <element signature="e#3821#3822#0" expanded="true" />
+            <element signature="e#3875#3876#0" expanded="true" />
+            <element signature="e#3953#3954#0" expanded="true" />
+            <element signature="e#3991#3992#0" expanded="true" />
+            <element signature="e#4053#4054#0" expanded="true" />
+            <element signature="e#4107#4108#0" expanded="true" />
+            <element signature="e#4186#4187#0" expanded="true" />
+            <element signature="e#4225#4226#0" expanded="true" />
+            <element signature="e#4289#4290#0" expanded="true" />
+            <element signature="e#4345#4346#0" expanded="true" />
+            <element signature="e#4430#4431#0" expanded="true" />
+            <element signature="e#4474#4475#0" expanded="true" />
+            <element signature="e#4698#4699#0" expanded="true" />
+            <element signature="e#4740#4741#0" expanded="true" />
+            <element signature="e#4810#4811#0" expanded="true" />
+            <element signature="e#4872#4873#0" expanded="true" />
+            <element signature="e#4955#4956#0" expanded="true" />
+            <element signature="e#4994#4995#0" expanded="true" />
+            <element signature="e#5058#5059#0" expanded="true" />
+            <element signature="e#5114#5115#0" expanded="true" />
+            <element signature="e#5194#5195#0" expanded="true" />
+            <element signature="e#5233#5234#0" expanded="true" />
+            <element signature="e#5297#5298#0" expanded="true" />
+            <element signature="e#5353#5354#0" expanded="true" />
+            <element signature="e#5428#5429#0" expanded="true" />
+            <element signature="e#5462#5463#0" expanded="true" />
+            <element signature="e#5516#5517#0" expanded="true" />
+            <element signature="e#5562#5563#0" expanded="true" />
+            <element signature="e#5634#5635#0" expanded="true" />
+            <element signature="e#5670#5671#0" expanded="true" />
+            <element signature="e#5728#5729#0" expanded="true" />
+            <element signature="e#5778#5779#0" expanded="true" />
+            <element signature="e#5852#5853#0" expanded="true" />
+            <element signature="e#5888#5889#0" expanded="true" />
+            <element signature="e#5946#5947#0" expanded="true" />
+            <element signature="e#5996#5997#0" expanded="true" />
+            <element signature="e#6067#6068#0" expanded="true" />
+            <element signature="e#6100#6101#0" expanded="true" />
+            <element signature="e#6152#6153#0" expanded="true" />
+            <element signature="e#6196#6197#0" expanded="true" />
+            <element signature="e#6261#6262#0" expanded="true" />
+            <element signature="e#6291#6292#0" expanded="true" />
+            <element signature="e#6337#6338#0" expanded="true" />
+            <element signature="e#6375#6376#0" expanded="true" />
+            <element signature="e#6437#6438#0" expanded="true" />
+            <element signature="e#6467#6468#0" expanded="true" />
+            <element signature="e#6513#6514#0" expanded="true" />
+            <element signature="e#6551#6552#0" expanded="true" />
+            <element signature="e#6613#6614#0" expanded="true" />
+            <element signature="e#6643#6644#0" expanded="true" />
+            <element signature="e#6689#6690#0" expanded="true" />
+            <element signature="e#6727#6728#0" expanded="true" />
+            <element signature="e#6796#6797#0" expanded="true" />
+            <element signature="e#6829#6830#0" expanded="true" />
+            <element signature="e#6881#6882#0" expanded="true" />
+            <element signature="e#6925#6926#0" expanded="true" />
+            <element signature="e#6995#6996#0" expanded="true" />
+            <element signature="e#7030#7031#0" expanded="true" />
+            <element signature="e#7086#7087#0" expanded="true" />
+            <element signature="e#7134#7135#0" expanded="true" />
+            <element signature="e#7202#7203#0" expanded="true" />
+            <element signature="e#7233#7234#0" expanded="true" />
+            <element signature="e#7281#7282#0" expanded="true" />
+            <element signature="e#7321#7322#0" expanded="true" />
+            <element signature="e#7390#7391#0" expanded="true" />
+            <element signature="e#7426#7427#0" expanded="true" />
+            <element signature="e#7484#7485#0" expanded="true" />
+            <element signature="e#7534#7535#0" expanded="true" />
+            <element signature="e#7602#7603#0" expanded="true" />
+            <element signature="e#7636#7637#0" expanded="true" />
+            <element signature="e#7690#7691#0" expanded="true" />
+            <element signature="e#7736#7737#0" expanded="true" />
+            <element signature="e#7806#7807#0" expanded="true" />
+            <element signature="e#7840#7841#0" expanded="true" />
+            <element signature="e#7894#7895#0" expanded="true" />
+            <element signature="e#7940#7941#0" expanded="true" />
+            <element signature="e#8006#8007#0" expanded="true" />
+            <element signature="e#8036#8037#0" expanded="true" />
+            <element signature="e#8082#8083#0" expanded="true" />
+            <element signature="e#8120#8121#0" expanded="true" />
+            <element signature="e#8189#8190#0" expanded="true" />
+            <element signature="e#8226#8227#0" expanded="true" />
+            <element signature="e#8286#8287#0" expanded="true" />
+            <element signature="e#8338#8339#0" expanded="true" />
+            <element signature="e#8417#8418#0" expanded="true" />
+            <element signature="e#8457#8458#0" expanded="true" />
+            <element signature="e#8523#8524#0" expanded="true" />
+            <element signature="e#8581#8582#0" expanded="true" />
+            <element signature="e#8655#8656#0" expanded="true" />
+            <element signature="e#8687#8688#0" expanded="true" />
+            <element signature="e#8737#8738#0" expanded="true" />
+            <element signature="e#8779#8780#0" expanded="true" />
+            <element signature="e#8846#8847#0" expanded="true" />
+            <element signature="e#8879#8880#0" expanded="true" />
+            <element signature="e#8931#8932#0" expanded="true" />
+            <element signature="e#8975#8976#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#787#788#0" expanded="true" />
+            <element signature="e#817#818#0" expanded="true" />
+            <element signature="e#2105#2106#0" expanded="true" />
+            <element signature="e#2135#2136#0" expanded="true" />
+            <element signature="e#2431#2432#0" expanded="true" />
+            <element signature="e#2461#2462#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index 854f1f1..0db633a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -165,12 +165,16 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String startDay,String endDay) {
+    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew) {
         try {
 
             Criteria criteria = createCriteria(PgAlarm.class);
             criteria.addOrder(Order.desc("id"));
 
+            if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) {
+                criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
+            }
+
             if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay))
             {
                 criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay)));
@@ -193,9 +197,11 @@
 
                 criteria.add(Restrictions.le("alarmDate",date));
             }
+            if(StringUtils.isNotBlank(isNew)&&isNew.equals("true"))
+                criteria.add(Restrictions.eq("active", 1));
 
             List<PgAlarm> pgAlarmList = criteria.list();
-            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
     }
 
     //根据设备位置(仓位)获取摄像机列表
-    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+    public List<PgDeviceDto> getPgCameraListByPosition(String partition,String position){
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.like("position",position+"%"));
-//        criteria.add(Restrictions.eq("devType","球机"));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(position))
+            criteria.add(Restrictions.like("position",position+"%"));
+
         criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
 
         List<PgDevice> pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
             dto.setDevCode(objects[5].toString());
             dto.setDevType(objects[6].toString());
             if(objects[7]!=null)
-            dto.setIp(objects[7].toString());
+                dto.setIp(objects[7].toString());
             dto.setIsOpen(objects[8].toString());
             dto.setPartition(objects[11].toString());
             dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index 8ebf74d..3c657a7 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgEquipment;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
 import com.casic.PgInterface.devTable.dto.PgEquipmentDto;
@@ -34,9 +35,12 @@
     public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
-        criteria.add(Restrictions.eq("eqName",eqName));
-        criteria.add(Restrictions.eq("eqCode",eqCode));
-        criteria.add(Restrictions.eq("eqType",eqType));
+        if(StringUtils.isNotBlank(eqName))
+            criteria.add(Restrictions.eq("eqName",eqName));
+        if(StringUtils.isNotBlank(eqCode))
+            criteria.add(Restrictions.eq("eqCode",eqCode));
+        if(StringUtils.isNotBlank(eqType))
+            criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
@@ -51,10 +55,9 @@
 
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
-        //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
         String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
-        +eqType+"' group by equipment.EQ_NAME";
+                +eqType+"' group by equipment.EQ_NAME";
 
         List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4ed68e4..e413a5c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
@@ -39,7 +40,8 @@
 
     public List<PgPipeLineDto> getPipeLineByLineType(String lineType) {
         Criteria criteria = createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineType", lineType));
+        if(StringUtils.isNotBlank(lineType))
+            criteria.add(Restrictions.eq("lineType", lineType));
 
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    private Long id;
-    private String keyId;//巡检记录单id
-    private String planId;//巡检计划ID
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    @Column(name="KEY_ID")
-    public String getKeyId() {
-        return keyId;
-    }
-
-    public void setKeyId(String keyId) {
-        this.keyId = keyId;
-    }
-
-    @Column(name="PLAN_ID")
-    public String getPlanId() {
-        return planId;
-    }
-
-    public void setPlanId(String planId) {
-        this.planId = planId;
-    }
-
-    @Column(name="CREATE_DATE")
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    @Column(name="STATE")
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    @Column(name="CREATOR")
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    @Column(name="PLAN_NAME")
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    @Column(name="RECORD_NO")
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    @Column(name="PLAN_NO")
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    @Column(name="RESPONSIBIE_DEPT")
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    @Column(name="INSPECTION_PERSON")
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    @Column(name="PATROL_MAN")
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    @Column(name="OPERATE_DATE")
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    @Column(name="REMARK")
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Column(name="BUILD_CABIN")
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    @Column(name="PROJECT")
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    @Column(name="START_PILE_NO")
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    @Column(name="END_PILE_NO")
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    @Column(name="INSPECTION_PRACE")
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    @Column(name="OTHER_PATROL_MAN")
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private Long id;
+    private String KEY_ID;//唯一键值
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_PERSON;//巡检人
+    private String START_DATE;//巡检开始时间
+    private String END_DATE;
+    private String FREQUENCY;//巡检频率
+    private String STATE;//状态
+    private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+    private String PLAN_NO;//巡检计划编号
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_MODE;//巡检方式
+    private String INSPECTION_ROUTE;//巡检路线
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String INSPECTION_GROUP;//巡检部门
+    private String INSERT_TIME;//插入时间
+    private String FREQUENCYDATE;//巡检具体日期
+    private String FREQUENCYTIME;//巡检具体时间
+    private String CREATEDATE;//创建时间
+    private String CREATOR;//创建人
+    private String PROJECT;//项目
+    private String COMLILE;//编制人
+    private String START_TIME;//编制时间
+    private String DEVELOP_DEPT;//制定部门
+    private String END_TIME;//结束时间
+    private String START_PILE_NO;//开始桩号
+    private String END_PILE_NO;//结束桩号
+    private String BUILD_CABIN;//巡检舱室
+    private String MILEAGE;
+    private String FREQUENCY_TIME;//巡检具体时间
+    private String FREQUENCYTIME_END;
+    private String KETTLE_TS;
+    private String UPDATEDATE;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="KEY_ID")
+    public String getKEY_ID() {
+        return KEY_ID;
+    }
+
+    public void setKEY_ID(String KEY_ID) {
+        this.KEY_ID = KEY_ID;
+    }
+
+    @Column(name="PLAN_NAME")
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    @Column(name="INSPECTION_PERSON")
+    public String getINSPECTION_PERSON() {
+        return INSPECTION_PERSON;
+    }
+
+    public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+        this.INSPECTION_PERSON = INSPECTION_PERSON;
+    }
+
+    @Column(name="START_DATE")
+    public String getSTART_DATE() {
+        return START_DATE;
+    }
+
+    public void setSTART_DATE(String START_DATE) {
+        this.START_DATE = START_DATE;
+    }
+
+    @Column(name="END_DATE")
+    public String getEND_DATE() {
+        return END_DATE;
+    }
+
+    public void setEND_DATE(String END_DATE) {
+        this.END_DATE = END_DATE;
+    }
+
+    @Column(name="FREQUENCY")
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    @Column(name="STATE")
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    @Column(name="RESPONSIBLE_DEPT")
+    public String getRESPONSIBLE_DEPT() {
+        return RESPONSIBLE_DEPT;
+    }
+
+    public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+        this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+    }
+
+    @Column(name="PLAN_NO")
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    @Column(name="INSPECTION_TYPE")
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    @Column(name="INSPECTION_MODE")
+    public String getINSPECTION_MODE() {
+        return INSPECTION_MODE;
+    }
+
+    public void setINSPECTION_MODE(String INSPECTION_MODE) {
+        this.INSPECTION_MODE = INSPECTION_MODE;
+    }
+
+    @Column(name="INSPECTION_ROUTE")
+    public String getINSPECTION_ROUTE() {
+        return INSPECTION_ROUTE;
+    }
+
+    public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+        this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+    }
+
+    @Column(name="INSPECTION_START_TIME")
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    @Column(name="INSPECTION_END_TIME")
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    @Column(name="INSPECTION_PRACE")
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    @Column(name="INSPECTION_GROUP")
+    public String getINSPECTION_GROUP() {
+        return INSPECTION_GROUP;
+    }
+
+    public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+        this.INSPECTION_GROUP = INSPECTION_GROUP;
+    }
+
+    @Column(name="INSERT_TIME")
+    public String getINSERT_TIME() {
+        return INSERT_TIME;
+    }
+
+    public void setINSERT_TIME(String INSERT_TIME) {
+        this.INSERT_TIME = INSERT_TIME;
+    }
+
+    @Column(name="FREQUENCYDATE")
+    public String getFREQUENCYDATE() {
+        return FREQUENCYDATE;
+    }
+
+    public void setFREQUENCYDATE(String FREQUENCYDATE) {
+        this.FREQUENCYDATE = FREQUENCYDATE;
+    }
+
+    @Column(name="FREQUENCYTIME")
+    public String getFREQUENCYTIME() {
+        return FREQUENCYTIME;
+    }
+
+    public void setFREQUENCYTIME(String FREQUENCYTIME) {
+        this.FREQUENCYTIME = FREQUENCYTIME;
+    }
+
+    @Column(name="CREATEDATE")
+    public String getCREATEDATE() {
+        return CREATEDATE;
+    }
+
+    public void setCREATEDATE(String CREATEDATE) {
+        this.CREATEDATE = CREATEDATE;
+    }
+
+    @Column(name="CREATOR")
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    @Column(name="PROJECT")
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    @Column(name="COMLILE")
+    public String getCOMLILE() {
+        return COMLILE;
+    }
+
+    public void setCOMLILE(String COMLILE) {
+        this.COMLILE = COMLILE;
+    }
+
+    @Column(name="START_TIME")
+    public String getSTART_TIME() {
+        return START_TIME;
+    }
+
+    public void setSTART_TIME(String START_TIME) {
+        this.START_TIME = START_TIME;
+    }
+
+    @Column(name="DEVELOP_DEPT")
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    @Column(name="END_TIME")
+    public String getEND_TIME() {
+        return END_TIME;
+    }
+
+    public void setEND_TIME(String END_TIME) {
+        this.END_TIME = END_TIME;
+    }
+
+    @Column(name="START_PILE_NO")
+    public String getSTART_PILE_NO() {
+        return START_PILE_NO;
+    }
+
+    public void setSTART_PILE_NO(String START_PILE_NO) {
+        this.START_PILE_NO = START_PILE_NO;
+    }
+
+    @Column(name="END_PILE_NO")
+    public String getEND_PILE_NO() {
+        return END_PILE_NO;
+    }
+
+    public void setEND_PILE_NO(String END_PILE_NO) {
+        this.END_PILE_NO = END_PILE_NO;
+    }
+
+    @Column(name="BUILD_CABIN")
+    public String getBUILD_CABIN() {
+        return BUILD_CABIN;
+    }
+
+    public void setBUILD_CABIN(String BUILD_CABIN) {
+        this.BUILD_CABIN = BUILD_CABIN;
+    }
+
+    @Column(name="MILEAGE")
+    public String getMILEAGE() {
+        return MILEAGE;
+    }
+
+    public void setMILEAGE(String MILEAGE) {
+        this.MILEAGE = MILEAGE;
+    }
+
+    @Column(name="FREQUENCY_TIME")
+    public String getFREQUENCY_TIME() {
+        return FREQUENCY_TIME;
+    }
+
+    public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+        this.FREQUENCY_TIME = FREQUENCY_TIME;
+    }
+
+    @Column(name="FREQUENCYTIME_END")
+    public String getFREQUENCYTIME_END() {
+        return FREQUENCYTIME_END;
+    }
+
+    public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+        this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+    }
+
+    @Column(name="KETTLE_TS")
+    public String getKETTLE_TS() {
+        return KETTLE_TS;
+    }
+
+    public void setKETTLE_TS(String KETTLE_TS) {
+        this.KETTLE_TS = KETTLE_TS;
+    }
+
+    @Column(name="UPDATEDATE")
+    public String getUPDATEDATE() {
+        return UPDATEDATE;
+    }
+
+    public void setUPDATEDATE(String UPDATEDATE) {
+        this.UPDATEDATE = UPDATEDATE;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 5346b57..2f8d359 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -66,7 +66,7 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REPAIRMAN")
+    @Column(name="REOAIRMAN")
     public String getRepairMan() {
         return repairMan;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
-    private Long id;
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-
-
-    public static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
-        PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
-        pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
-        pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
-        pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
-        pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
-        pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
-        pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
-        pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
-        pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
-        pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
-        pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
-        pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
-        pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
-        pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
-        pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
-        return pgAssetInSpectionRecordDto;
-    }
-
-
-    public static List<PgAssetInSpectionRecordDto> ConvertToDtoList(List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList){
-        List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-        for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
-            pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
-        }
-
-        return pgAssetInSpectionRecordDtoList;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
-    private String num;
-    private String createDate;
-
-    public String getNum() {
-        return num;
-    }
-
-    public void setNum(String num) {
-        this.num = num;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+    private Long id;
+    private String PLAN_NO;//巡检计划编号
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String FREQUENCY;//巡检频率
+    private String CREATOR;//创建人
+    private String DEVELOP_DEPT;//制定部门
+    private String PROJECT;//项目
+    private String STATE;//状态
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+        PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+        pgAssetPlanDto.setId(pgAssetPlan.getId());
+        pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+        pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+        pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+        pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+        pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+        pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+        pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+        pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+        pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+        pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+        pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+        return pgAssetPlanDto;
+    }
+
+    public static List<PgAssetPlanDto> ConvertToPgAssetDtoList(List<PgAssetPlan> pgAssetPlanList){
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
+
+        for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+            pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+        }
+
+        return pgAssetPlanDtoList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
new file mode 100644
index 0000000..bc12db1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
@@ -0,0 +1,24 @@
+package com.casic.PgInterface.maintenance.dto;
+
+public class PgAssetPlanStatic {
+
+    private String num;
+    private String createDate;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
deleted file mode 100644
index c41ca7d..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.casic.PgInterface.maintenance.manager;
-
-import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
-
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
-        try {
-            String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
-                    "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
-                    "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-
-            if(patrolMan!=null)
-                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
-            if(startTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
-            if(endTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')<to_date('"+endTime+"','yyyy-MM-dd')";
-
-            sql+=" order by id";
-
-            List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
-
-            List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList=new ArrayList<>();
-            for(Object[] objects1:objects){
-                PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord();
-
-                pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString()));
-                pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1]));
-                pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2]));
-                pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3]));
-                pgAssetInSpectionRecord.setState(String.valueOf(objects1[4]));
-                pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5]));
-                pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6]));
-                pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7]));
-                pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8]));
-                pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9]));
-                pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10]));
-                pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11]));
-                pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12]));
-                pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13]));
-                pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14]));
-                pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15]));
-                pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16]));
-                pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17]));
-                pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18]));
-                pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19]));
-
-                pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord);
-            }
-
-            List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-            for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList)
-            {
-                pgAssetInSpectionRecordDtoList.add(PgAssetInSpectionRecordDto.ConvertToDto(pgAssetInSpectionRecord));
-            }
-
-            return pgAssetInSpectionRecordDtoList;
-        }
-        catch(Exception e)
-        {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public List<PgAssetInSpectionRecordStatic> getPgAssetInSpectionRecordStaticLisByTime(
-            String startTime, String endTime, String staticType) {
-
-        String sql="";
-        String dateType="";
-        List<PgAssetInSpectionRecordStatic> pgAssetInSpectionRecordStaticList=new ArrayList<>();
-        int type=Integer.valueOf(staticType);
-
-        switch(type) {
-            case 0://年
-                dateType = "yyyy";
-                break;
-            case 1://月
-                dateType = "yyyy-mm";
-                break;
-            case 2://周
-                dateType = "iw";
-                break;
-            case 3://日
-                dateType="yyyy-mm-dd";
-                break;
-            default:
-                break;
-        }
-
-        sql="select count(*), to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_RECORD t where 1=1";
-
-        if(startTime!=null)
-            sql+=" and t.CREATE_DATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
-        if(endTime!=null)
-            sql+=" and t.CREATE_DATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
-
-        sql+=" group by to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"')";
-
-        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
-        for(int i=0;i<objects.size();i++)
-        {
-            PgAssetInSpectionRecordStatic pgAssetInSpectionRecordStatic=new PgAssetInSpectionRecordStatic();
-            pgAssetInSpectionRecordStatic.setNum(objects.get(i)[0].toString());
-            pgAssetInSpectionRecordStatic.setCreateDate(objects.get(i)[1].toString());
-            pgAssetInSpectionRecordStaticList.add(pgAssetInSpectionRecordStatic);
-        }
-        return pgAssetInSpectionRecordStaticList;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
new file mode 100644
index 0000000..bb6bf1e
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
@@ -0,0 +1,81 @@
+package com.casic.PgInterface.maintenance.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgAssetPlanManager extends HibernateEntityDao<PgAssetPlan> {
+
+    public List<PgAssetPlanDto> getPgAssetPlanDtoList(String inSpectionPlace){
+        Criteria criteria=createCriteria(PgAssetPlan.class);
+
+        if(StringUtils.isNotBlank(inSpectionPlace))
+            criteria.add(Restrictions.like("INSPECTION_PRACE","%"+inSpectionPlace+"%"));
+        criteria.addOrder(Order.desc("id"));
+
+        List<PgAssetPlan> pgAssetPlanList=criteria.list();
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=PgAssetPlanDto.ConvertToPgAssetDtoList(pgAssetPlanList);
+
+        if(pgAssetPlanDtoList==null||pgAssetPlanDtoList.size()==0)
+            return null;
+        else
+            return pgAssetPlanDtoList;
+    }
+
+    public List<PgAssetPlanStatic> getPgAssetPlanStaticLisByTime(
+            String startTime, String endTime, String staticType) {
+
+        String sql="";
+        String dateType="";
+        List<PgAssetPlanStatic> pgAssetPlanStaticList=new ArrayList<>();
+        int type=Integer.valueOf(staticType);
+
+        switch(type) {
+            case 0://年
+                dateType = "yyyy";
+                break;
+            case 1://月
+                dateType = "yyyy-mm";
+                break;
+            case 2://周
+                dateType = "iw";
+                break;
+            case 3://日
+                dateType="yyyy-mm-dd";
+                break;
+            default:
+                break;
+        }
+
+        sql="select count(*), to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_PLAN t where 1=1";
+
+        if(startTime!=null)
+            sql+=" and t.CREATEDATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
+        if(endTime!=null)
+            sql+=" and t.CREATEDATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
+
+        sql+=" group by to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"')";
+
+        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
+        for(int i=0;i<objects.size();i++)
+        {
+            PgAssetPlanStatic pgAssetPlanStatic=new PgAssetPlanStatic();
+            pgAssetPlanStatic.setNum(objects.get(i)[0].toString());
+            pgAssetPlanStatic.setCreateDate(objects.get(i)[1].toString());
+            pgAssetPlanStaticList.add(pgAssetPlanStatic);
+        }
+        return pgAssetPlanStaticList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 0903f22..3484739 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -15,7 +15,7 @@
 
     public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
             if(repairMan!=null)
                 sql+=" and REPAIRMAN like '%"+repairMan+"%'";
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index 9cc2881..6d90d7b 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -1,5 +1,7 @@
 package com.casic.PgInterface.patroler.dto;
 
+import com.casic.PgInterface.devTable.domain.PgDevice;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 
 /**
@@ -14,6 +16,7 @@
     private String unit;//单位
     private String alarmType;//报警类型
     private Long pgDeviceId;//设备编号
+    private String assetCode;//资产编号
 
     public Long getId() {
         return id;
@@ -71,7 +74,15 @@
         this.pgDeviceId = pgDeviceId;
     }
 
-    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
+    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule, PgDeviceManager pgDeviceManager) {
         this.setId(pgAlarmRule.getId());
         this.setHighValue(pgAlarmRule.getHighValue());
         this.setLowValue(pgAlarmRule.getLowValue());
@@ -82,6 +93,10 @@
         else
             this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
         this.setPgDeviceId(pgAlarmRule.getPgDeviceId());
+        if(pgAlarmRule.getAlarmTypeId()!=null&&pgDeviceManager.get(pgAlarmRule.getPgDeviceId())!=null)
+            this.setAssetCode(pgDeviceManager.get(pgAlarmRule.getPgDeviceId()).getAssetCode());
+        else
+            this.setAssetCode("");
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
index c132c98..a7cef5b 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
@@ -1,13 +1,17 @@
 package com.casic.PgInterface.patroler.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.ResponseStatus;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -17,30 +21,23 @@
 @Service
 public class PgAlarmRuleManager extends HibernateEntityDao<PgAlarmRule> {
 
+    @Resource
+    private PgDeviceManager pgDeviceManager;
+
     //根据设备获取设备报警阈值
-    public List<PgAlarmRuleDto>  getAlarmRuleDto() {
+    public List<PgAlarmRuleDto>  getAlarmRuleDto(String devType) {
         Criteria criteria=createCriteria(PgAlarmRule.class);
+
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.eq("devType", devType));
         criteria.addOrder(Order.desc("id"));
 
         List<PgAlarmRule> pgAlarmRuleList=criteria.list();
-        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
+        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         for (PgAlarmRule pgAlarmRule : pgAlarmRuleList) {
-            pgAlarmRuleDtoList.add(new PgAlarmRuleDto(pgAlarmRule));
+            pgAlarmRuleDtoList.add(new PgAlarmRuleDto(pgAlarmRule,pgDeviceManager));
         }
         return pgAlarmRuleDtoList;
-
     }
 
-    public PgAlarmRule getAlarmRuleBydevType(String devType) {
-        Criteria criteria=createCriteria(PgAlarmRule.class);
-        criteria.add(Restrictions.eq("devType", devType));
-
-        List<PgAlarmRule> pgAlarmRuleList=criteria.list();
-
-        if(pgAlarmRuleList==null||pgAlarmRuleList.size()==0)
-            return null;
-        else
-            return pgAlarmRuleList.get(0);
-    }
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index d0e28f5..082ba5d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgAlarm;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
@@ -39,7 +40,7 @@
     private PgReservePlanManager pgReservePlanManager;
 
     /*
-    * 获取报警设备信息
+     * 获取报警设备信息
      */
     @POST
     @Path("linkDevice")
@@ -50,11 +51,22 @@
 
         PgDeviceDto pgDeviceDto = null;
         try {
-            PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
-            PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
-
-            pgDeviceDto=new PgDeviceDto(pgDevice);
-            msg = "报警关联设备获取成功";
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if (pgAlarm == null)
+                    msg = "不存在报警信息";
+                else {
+                    PgDevice pgDevice = pgAlarm.getAlarmDevId();
+                    if (pgDevice == null)
+                        msg = "不存在报警设备";
+                    else {
+                        pgDeviceDto = new PgDeviceDto(pgDevice);
+                        msg = "报警关联设备获取成功";
+                    }
+                }
+            }
+            else
+                msg="未接受到报警设备ID信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取关联设备失败";
@@ -77,11 +89,28 @@
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
-            PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
-            PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
-            pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if(pgAlarm==null)
+                    msg="不存在报警信息";
+                else {
+                    PgDevice pgDevice = pgAlarm.getAlarmDevId();
+                    if (pgDevice == null)
+                        msg = "不存在报警设备";
+                    else {
+                        String strPosition=pgDevice.getPosition();
+                        String position="";
+                        if(!strPosition.equals(""))
+                            position=pgDevice.getPosition().substring(0,3);
+                        String partition=pgDevice.getPartition();
 
-            msg = "关联设备获取成功";
+                        pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
+                        msg = "关联设备获取成功";
+                    }
+                }
+            }
+            else
+                msg="请输入报警设备Id信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "分区设备关联失败";
@@ -93,7 +122,7 @@
 
     /*
      * 根据报警记录获取关联的预案
-    */
+     */
     @POST
     @Path("linkReservePlan")
     @Produces(MediaType.APPLICATION_JSON)
@@ -103,10 +132,21 @@
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
-            PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
-            pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if (pgAlarm == null)
+                    msg = "不存在报警信息";
+                else {
+                    pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-            msg="关联预案获取成功";
+                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
+                        msg="不存在关联的报警预案";
+                    else
+                        msg = "关联预案获取成功";
+                }
+            }
+            else
+                msg="请输入报警信息";
         }
         catch(Exception e)
         {
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index d18ebb8..baacd93 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -48,14 +48,16 @@
     @POST
     @Path("getAlarmInfo")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmList(@FormParam("startDay") String startDay,
-                                            @FormParam("endDay") String endDay) throws Exception {
+    public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
+                                            @FormParam("startDay") String startDay,
+                                            @FormParam("endDay") String endDay,
+                                            @FormParam("isNew") String isNew) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(startDay,endDay);
-            if (pgAlarmDtoList.size() == 0)
+            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew);
+            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
                 msg = "没有报警信息";
             else
                 msg = "报警信息获取成功";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 87afd54..29ce8a4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -1,7 +1,5 @@
 package com.casic.PgInterface.rs;
 
-import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager;
-import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import com.casic.PgInterface.patroler.manager.PgAlarmRuleManager;
@@ -30,119 +28,23 @@
     private static Logger logger = LoggerFactory.getLogger(PgAlarmRule.class);
 
     @Resource
-    private PgDeviceManager pgDeviceManager;
-    @Resource
-    private PgAlarmTypeManager pgAlarmTypeManager;
-    @Resource
     private PgAlarmRuleManager pgAlarmRuleManager;
 
-
-
-    /**
-     * 新增报警阈值
-     */
-    @POST
-    @Path("addAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> addAlarmRule(@FormParam("highValue") String highValue,
-                                            @FormParam("lowValue") String lowValue,
-                                            @FormParam("unit") String unit,
-                                            @FormParam("devType") String devType,
-                                            @FormParam("alarmType") String alarmType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType);
-            if (pgAlarmRule != null) {
-                result = "false";
-                msg = "设备阈值已经存在";
-            } else {
-                pgAlarmRule = new PgAlarmRule();
-                pgAlarmRule.setHighValue(highValue);
-                pgAlarmRule.setLowValue(lowValue);
-                pgAlarmRule.setDevType(devType);
-                pgAlarmRule.setUnit(unit);
-                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
-
-                pgAlarmRuleManager.save(pgAlarmRule);
-                result = "true";
-                msg = "报警阈值新增成功";
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = "false";
-            msg = "报警阈值新增失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-        return resultMap;
-    }
-
-    /**
-     * 编辑报警阈值
-     */
-    @POST
-    @Path("editAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> editAlarmRule(@FormParam("id") String id,
-                                             @FormParam("devType") String devType,
-                                             @FormParam("highValue") String highValue,
-                                             @FormParam("lowValue") String lowValue,
-                                             @FormParam("unit") String unit,
-                                             @FormParam("alarmType") String alarmType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
-            if (pgAlarmRule == null) {
-                msg = "不存在报警阈值记录";
-                result = "false";
-            } else {
-                pgAlarmRule.setDevType(devType);
-                pgAlarmRule.setHighValue(highValue);
-                pgAlarmRule.setLowValue(lowValue);
-                pgAlarmRule.setUnit(unit);
-                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
-
-                pgAlarmRuleManager.save(pgAlarmRule);
-                msg = "编辑成功";
-                result = "true";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            result = "false";
-            msg = "报警阈值编辑失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-
-        return resultMap;
-    }
-
     /**
      * 获取报警阈值信息
      */
     @POST
     @Path("getAlarmRule")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmRule() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+    public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
+        System.out.println("devType:"+devType);
+        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
-            pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto();
-            if (pgAlarmRuleDtoList == null)
+            pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
+            if (pgAlarmRuleDtoList == null||pgAlarmRuleDtoList.size()==0)
                 msg = "不存在报警阈值信息";
             else
                 msg = "报警阈值获取成功";
@@ -155,69 +57,4 @@
         return resultMap;
     }
 
-    /**
-     * 删除报警阈值
-     */
-    @POST
-    @Path("deleteAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> deleteAlarmRule(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
-            if (pgAlarmRule == null) {
-                msg = "不存在报警阈值记录";
-                result = "false";
-            } else {
-                pgAlarmRuleManager.remove(pgAlarmRule);
-                msg = "删除成功";
-                result = "true";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            result = "false";
-            msg = "报警阈值删除失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-
-        return resultMap;
-    }
-
-    /**
-     * 根据设备类型报警阈值
-     */
-    @POST
-    @Path("getAlarmRuleByDevType")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmRuleByDevType(@FormParam("devType") String devType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        PgAlarmRule pgAlarmRule = null;
-        List<PgAlarmRuleDto> pgAlarmRuleDtos = new ArrayList<>();
-        try {
-            pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType);
-            if (pgAlarmRule == null)
-                msg = "不存在报警阈值记录";
-            else {
-                PgAlarmRuleDto pgAlarmRuleDto= new PgAlarmRuleDto(pgAlarmRule);
-                pgAlarmRuleDtos.add(pgAlarmRuleDto);
-                msg = "报警阈值获取成功";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            msg = "报警阈值获取失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmRuleDtos);
-
-        return resultMap;
-    }
-
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
new file mode 100644
index 0000000..19d3b8c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanRs")
+public class PgAssetPlanRs {
+
+    @Resource
+    private PgAssetPlanManager pgAssetPlanManager;
+
+    /**
+     * 获取巡检记录
+     */
+    @POST
+    @Path("getPgAssetPlanList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPgAssetPlanList(@FormParam("inSpectionPlace") String inSpectionPlace){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
+        try{
+            pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(inSpectionPlace);
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
+                msg="巡检信息获取成功";
+            else
+                msg="不存在巡检信息";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="巡检信息获取失败";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAssetPlanDtoList);
+
+        return resultMap;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
new file mode 100644
index 0000000..47ef9d1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanStaticRs")
+public class PgAssetPlanStaticRs {
+
+    @Resource
+    private PgAssetPlanManager pgAssetPlanManager;
+
+    @POST
+    @Path("getPgAssetPlanStaticList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPgAssetPlanStaticList(@FormParam("startTime") String startTime,
+                                                       @FormParam("endTime") String endTime,
+                                                       @FormParam("staticType") String staticType) throws Exception{
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
+        try{
+            pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
+                msg="巡检统计信息获取成功";
+            else
+                msg="统计信息获取失败";
+        }
+        catch (Exception ex){
+            ex.printStackTrace();
+            msg="统计失败";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAssetPlanStaticList);
+
+        return resultMap;
+    }
+
+}

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ff69e2a..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,27 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190828.docx" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -32,72 +42,119 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="2" />
-          <entry key="java" value="243" />
-          <entry key="properties" value="6" />
+          <entry key="java" value="321" />
+          <entry key="properties" value="8" />
           <entry key="xml" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
-          <entry key="JAVA" value="243" />
-          <entry key="Properties" value="6" />
+          <entry key="JAVA" value="321" />
+          <entry key="Properties" value="8" />
           <entry key="XML" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="8082" />
-          <entry key="properties" value="49" />
-          <entry key="txt" value="64" />
+          <entry key="dummy" value="16" />
+          <entry key="java" value="10723" />
+          <entry key="properties" value="59" />
+          <entry key="txt" value="118" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="8082" />
-          <entry key="PLAIN_TEXT" value="64" />
-          <entry key="Properties" value="49" />
+          <entry key="JAVA" value="10723" />
+          <entry key="PLAIN_TEXT" value="134" />
+          <entry key="Properties" value="59" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="4" />
+          <entry key="project.closed" value="28" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
           <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.24" value="1" />
+          <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="1" />
-          <entry key="project.open.time.3" value="3" />
-          <entry key="project.open.time.31" value="1" />
+          <entry key="project.open.time.28" value="1" />
+          <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.31" value="2" />
           <entry key="project.open.time.37" value="1" />
+          <entry key="project.open.time.39" value="2" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.40" value="1" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="1" />
+          <entry key="project.open.time.44" value="2" />
           <entry key="project.open.time.45" value="2" />
           <entry key="project.open.time.48" value="1" />
           <entry key="project.open.time.49" value="1" />
+          <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.58" value="1" />
           <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.71" value="1" />
+          <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.71" value="2" />
           <entry key="project.open.time.76" value="1" />
-          <entry key="project.opened" value="25" />
+          <entry key="project.opened" value="41" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+            <state relative-caret-position="174">
+              <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
               <folding>
-                <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-                <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="352">
+              <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#787#788#0" expanded="true" />
+                <element signature="e#817#818#0" expanded="true" />
+                <element signature="e#2105#2106#0" expanded="true" />
+                <element signature="e#2135#2136#0" expanded="true" />
+                <element signature="e#2431#2432#0" expanded="true" />
+                <element signature="e#2461#2462#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="638">
+              <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+              <folding>
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -122,6 +179,7 @@
       <find>getPgDeviceByDevType</find>
       <find>message</find>
       <find>getConstructionByType</find>
+      <find>getPgCameraListByPosition</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -130,24 +188,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanTypeDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
@@ -162,17 +207,38 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
       </list>
     </option>
   </component>
@@ -208,16 +274,18 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="3" />
-    <option name="y" value="10" />
-    <option name="width" value="1386" />
-    <option name="height" value="788" />
+    <option name="x" value="1410" />
+    <option name="y" value="117" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -258,7 +326,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -267,16 +335,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -286,7 +345,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="dto" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -296,7 +355,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="manager" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -308,19 +367,10 @@
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="webapp" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -359,6 +409,7 @@
       </deployment>
       <server-settings>
         <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_7" />
+        <option name="JNDI_PORT" value="10991" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -456,7 +507,23 @@
       <workItem from="1566350810712" duration="6803000" />
       <workItem from="1566435787074" duration="10717000" />
       <workItem from="1566521753529" duration="14265000" />
-      <workItem from="1566614176989" duration="5693000" />
+      <workItem from="1566614176989" duration="14059000" />
+      <workItem from="1566780822009" duration="1026000" />
+      <workItem from="1566891563975" duration="284000" />
+      <workItem from="1566893107340" duration="3382000" />
+      <workItem from="1566953794976" duration="11039000" />
+      <workItem from="1567059357700" duration="484000" />
+      <workItem from="1567082835097" duration="1086000" />
+      <workItem from="1567126428020" duration="1539000" />
+      <workItem from="1567129277820" duration="5788000" />
+      <workItem from="1567136008996" duration="2568000" />
+      <workItem from="1567237040302" duration="111000" />
+      <workItem from="1567495626345" duration="2797000" />
+      <workItem from="1567558770152" duration="2352000" />
+      <workItem from="1567577368149" duration="640000" />
+      <workItem from="1567751224608" duration="780000" />
+      <workItem from="1568019299799" duration="695000" />
+      <workItem from="1568082566133" duration="4016000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -493,17 +560,60 @@
       <option name="project" value="LOCAL" />
       <updated>1566553388171</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="整理管线部分">
+      <created>1566620046627</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1566620046627</updated>
+    </task>
+    <task id="LOCAL-00007" summary="合并代码提交">
+      <created>1566781001910</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1566781001910</updated>
+    </task>
+    <task id="LOCAL-00008" summary="合并代码提交">
+      <created>1566963831930</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1566963831930</updated>
+    </task>
+    <task id="LOCAL-00009" summary="修改报警阈值">
+      <created>1566972146710</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1566972146710</updated>
+    </task>
+    <task id="LOCAL-00010" summary="修改巡检维护表字段">
+      <created>1567126525554</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1567126525554</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="142930000" />
+    <option name="totallyTimeSpent" value="189883000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
+    <frame x="1358" y="-8" width="1456" height="916" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29297996" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -511,13 +621,14 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Thumbnails" weight="0.3295082" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.5081967" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.3849105" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
       <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
       <window_info anchor="bottom" id="Spring" order="8" />
       <window_info anchor="bottom" id="Terminal" order="9" />
@@ -539,7 +650,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2193646" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -547,22 +658,23 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.47540984" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
-      <window_info anchor="bottom" id="Spring" order="8" />
-      <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
-      <window_info anchor="bottom" id="Statistic" order="11" />
-      <window_info anchor="bottom" id="Java Enterprise" order="12" />
-      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="14" weight="0.32786885" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.52307695" />
+      <window_info anchor="bottom" id="Thumbnails" order="0" weight="0.3295082" />
+      <window_info anchor="bottom" id="Message" order="1" />
+      <window_info anchor="bottom" id="Find" order="2" />
+      <window_info anchor="bottom" id="Run" order="3" />
+      <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.49924356" weight="0.49344262" />
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Application Servers" order="8" weight="0.3276923" />
+      <window_info anchor="bottom" id="Spring" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
+      <window_info anchor="bottom" id="Statistic" order="12" />
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <window_info anchor="bottom" id="Database Changes" order="14" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="15" weight="0.32786885" />
+      <window_info anchor="bottom" id="Messages" order="16" weight="0.5229508" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -578,6 +690,16 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -587,7 +709,11 @@
     <MESSAGE value="修改权限问题" />
     <MESSAGE value="修改人员登录返回接口" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整理管线部分" />
+    <MESSAGE value="合并代码提交" />
+    <MESSAGE value="修改报警阈值" />
+    <MESSAGE value="修改巡检维护表字段" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护表字段" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -602,322 +728,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-532">
-          <caret line="50" column="28" lean-forward="true" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="19" column="60" selection-start-line="19" selection-start-column="60" selection-end-line="19" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="100" column="34" lean-forward="true" selection-start-line="100" selection-start-column="34" selection-end-line="100" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1474">
-          <caret line="84" column="58" selection-start-line="84" selection-start-column="58" selection-end-line="84" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1100">
-          <caret line="58" column="18" selection-start-line="58" selection-start-column="18" selection-end-line="58" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6842">
-          <caret line="329" selection-start-line="329" selection-end-line="329" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="102" column="24" lean-forward="true" selection-start-line="102" selection-start-column="24" selection-end-line="102" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="72" column="56" lean-forward="true" selection-start-line="72" selection-start-column="56" selection-end-line="72" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="90" column="39" lean-forward="true" selection-start-line="90" selection-start-column="39" selection-end-line="90" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="97" column="16" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
-          <caret line="14" column="52" lean-forward="true" selection-start-line="14" selection-start-column="52" selection-end-line="14" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="26" column="34" lean-forward="true" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="61" column="1" lean-forward="true" selection-start-line="61" selection-start-column="1" selection-end-line="61" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="208" column="49" lean-forward="true" selection-start-line="208" selection-start-column="49" selection-end-line="208" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="140" column="57" selection-start-line="140" selection-start-column="57" selection-end-line="140" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="111" column="36" selection-start-line="111" selection-start-column="36" selection-end-line="111" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="3" lean-forward="true" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="81" column="58" lean-forward="true" selection-start-line="81" selection-start-column="58" selection-end-line="81" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="472">
-          <caret line="118" column="59" selection-start-line="118" selection-start-column="59" selection-end-line="118" selection-end-column="59" />
-          <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-198">
-          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="69" column="32" lean-forward="true" selection-start-line="69" selection-start-column="32" selection-end-line="70" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="142" column="59" lean-forward="true" selection-start-line="142" selection-start-column="59" selection-end-line="142" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="349" column="9" lean-forward="true" selection-start-line="349" selection-start-column="9" selection-end-line="349" selection-end-column="9" />
-          <folding>
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="e#12105#12121#0" expanded="true" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-686">
-          <caret line="67" column="31" lean-forward="true" selection-start-line="67" selection-start-column="31" selection-end-line="67" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="93" column="24" lean-forward="true" selection-start-line="93" selection-start-column="24" selection-end-line="93" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="57" column="23" lean-forward="true" selection-start-line="57" selection-start-column="23" selection-end-line="57" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-408">
-          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="98" column="40" lean-forward="true" selection-start-line="98" selection-start-column="40" selection-end-line="98" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="572">
@@ -925,13 +735,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="328" column="32" lean-forward="true" selection-start-line="328" selection-start-column="32" selection-end-line="328" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
@@ -950,16 +753,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="396">
           <caret line="23" column="32" lean-forward="true" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
-          <folding>
-            <element signature="e#2635#2636#0" expanded="true" />
-            <element signature="e#2671#2672#0" expanded="true" />
-            <element signature="e#2727#2728#0" expanded="true" />
-            <element signature="e#2777#2778#0" expanded="true" />
-            <element signature="e#2877#2878#0" expanded="true" />
-            <element signature="e#2911#2912#0" expanded="true" />
-            <element signature="e#2963#2964#0" expanded="true" />
-            <element signature="e#3009#3010#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -972,14 +765,481 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+        <state relative-caret-position="66">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="59" column="46" lean-forward="true" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3586">
+          <caret line="179" column="16" selection-start-line="179" selection-start-column="16" selection-end-line="179" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5478">
+          <caret line="273" column="3" selection-start-line="273" selection-start-column="3" selection-end-line="273" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1870">
+          <caret line="147" column="11" selection-start-line="147" selection-start-column="11" selection-end-line="147" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="55" column="15" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="106">
+          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="290" column="41" lean-forward="true" selection-start-line="290" selection-start-column="41" selection-end-line="290" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="21" column="32" lean-forward="true" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="550">
+          <caret line="38" column="89" selection-start-line="38" selection-start-column="89" selection-end-line="38" selection-end-column="89" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="11" column="28" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1166">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="818">
+          <caret line="285" column="13" lean-forward="true" selection-start-line="285" selection-start-column="13" selection-end-line="285" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="129" column="31" lean-forward="true" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="323" column="72" lean-forward="true" selection-start-line="323" selection-start-column="72" selection-end-line="323" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="44" column="13" lean-forward="true" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-638">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="244">
+          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="157">
+          <caret line="16" column="55" lean-forward="true" selection-start-line="16" selection-start-column="55" selection-end-line="16" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="270" column="33" lean-forward="true" selection-start-line="270" selection-start-column="33" selection-end-line="270" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="490">
+          <caret line="141" selection-start-line="141" selection-end-line="141" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="164" column="5" lean-forward="true" selection-start-line="164" selection-start-column="5" selection-end-line="164" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/apiTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-242">
+          <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="61" column="16" lean-forward="true" selection-start-line="61" selection-start-column="16" selection-end-line="61" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="700">
+          <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="12" column="34" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="39" column="9" lean-forward="true" selection-start-line="39" selection-start-column="9" selection-end-line="39" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="32" column="29" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="29" />
           <folding>
-            <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-            <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#1838#1839#0" expanded="true" />
+            <element signature="e#1863#1864#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1925#1926#0" expanded="true" />
+            <element signature="e#1822#1823#0" expanded="true" />
+            <element signature="e#1851#1852#0" expanded="true" />
+            <element signature="e#1895#1896#0" expanded="true" />
+            <element signature="e#1931#1932#0" expanded="true" />
+            <element signature="e#2132#2133#0" expanded="true" />
+            <element signature="e#2164#2165#0" expanded="true" />
+            <element signature="e#2214#2215#0" expanded="true" />
+            <element signature="e#2256#2257#0" expanded="true" />
+            <element signature="e#2330#2331#0" expanded="true" />
+            <element signature="e#2370#2371#0" expanded="true" />
+            <element signature="e#2436#2437#0" expanded="true" />
+            <element signature="e#2494#2495#0" expanded="true" />
+            <element signature="e#2569#2570#0" expanded="true" />
+            <element signature="e#2602#2603#0" expanded="true" />
+            <element signature="e#2654#2655#0" expanded="true" />
+            <element signature="e#2698#2699#0" expanded="true" />
+            <element signature="e#2764#2765#0" expanded="true" />
+            <element signature="e#2795#2796#0" expanded="true" />
+            <element signature="e#2843#2844#0" expanded="true" />
+            <element signature="e#2883#2884#0" expanded="true" />
+            <element signature="e#2948#2949#0" expanded="true" />
+            <element signature="e#2980#2981#0" expanded="true" />
+            <element signature="e#3030#3031#0" expanded="true" />
+            <element signature="e#3072#3073#0" expanded="true" />
+            <element signature="e#3134#3135#0" expanded="true" />
+            <element signature="e#3162#3163#0" expanded="true" />
+            <element signature="e#3204#3205#0" expanded="true" />
+            <element signature="e#3238#3239#0" expanded="true" />
+            <element signature="e#3307#3308#0" expanded="true" />
+            <element signature="e#3346#3347#0" expanded="true" />
+            <element signature="e#3410#3411#0" expanded="true" />
+            <element signature="e#3466#3467#0" expanded="true" />
+            <element signature="e#3537#3538#0" expanded="true" />
+            <element signature="e#3567#3568#0" expanded="true" />
+            <element signature="e#3613#3614#0" expanded="true" />
+            <element signature="e#3651#3652#0" expanded="true" />
+            <element signature="e#3721#3722#0" expanded="true" />
+            <element signature="e#3759#3760#0" expanded="true" />
+            <element signature="e#3821#3822#0" expanded="true" />
+            <element signature="e#3875#3876#0" expanded="true" />
+            <element signature="e#3953#3954#0" expanded="true" />
+            <element signature="e#3991#3992#0" expanded="true" />
+            <element signature="e#4053#4054#0" expanded="true" />
+            <element signature="e#4107#4108#0" expanded="true" />
+            <element signature="e#4186#4187#0" expanded="true" />
+            <element signature="e#4225#4226#0" expanded="true" />
+            <element signature="e#4289#4290#0" expanded="true" />
+            <element signature="e#4345#4346#0" expanded="true" />
+            <element signature="e#4430#4431#0" expanded="true" />
+            <element signature="e#4474#4475#0" expanded="true" />
+            <element signature="e#4698#4699#0" expanded="true" />
+            <element signature="e#4740#4741#0" expanded="true" />
+            <element signature="e#4810#4811#0" expanded="true" />
+            <element signature="e#4872#4873#0" expanded="true" />
+            <element signature="e#4955#4956#0" expanded="true" />
+            <element signature="e#4994#4995#0" expanded="true" />
+            <element signature="e#5058#5059#0" expanded="true" />
+            <element signature="e#5114#5115#0" expanded="true" />
+            <element signature="e#5194#5195#0" expanded="true" />
+            <element signature="e#5233#5234#0" expanded="true" />
+            <element signature="e#5297#5298#0" expanded="true" />
+            <element signature="e#5353#5354#0" expanded="true" />
+            <element signature="e#5428#5429#0" expanded="true" />
+            <element signature="e#5462#5463#0" expanded="true" />
+            <element signature="e#5516#5517#0" expanded="true" />
+            <element signature="e#5562#5563#0" expanded="true" />
+            <element signature="e#5634#5635#0" expanded="true" />
+            <element signature="e#5670#5671#0" expanded="true" />
+            <element signature="e#5728#5729#0" expanded="true" />
+            <element signature="e#5778#5779#0" expanded="true" />
+            <element signature="e#5852#5853#0" expanded="true" />
+            <element signature="e#5888#5889#0" expanded="true" />
+            <element signature="e#5946#5947#0" expanded="true" />
+            <element signature="e#5996#5997#0" expanded="true" />
+            <element signature="e#6067#6068#0" expanded="true" />
+            <element signature="e#6100#6101#0" expanded="true" />
+            <element signature="e#6152#6153#0" expanded="true" />
+            <element signature="e#6196#6197#0" expanded="true" />
+            <element signature="e#6261#6262#0" expanded="true" />
+            <element signature="e#6291#6292#0" expanded="true" />
+            <element signature="e#6337#6338#0" expanded="true" />
+            <element signature="e#6375#6376#0" expanded="true" />
+            <element signature="e#6437#6438#0" expanded="true" />
+            <element signature="e#6467#6468#0" expanded="true" />
+            <element signature="e#6513#6514#0" expanded="true" />
+            <element signature="e#6551#6552#0" expanded="true" />
+            <element signature="e#6613#6614#0" expanded="true" />
+            <element signature="e#6643#6644#0" expanded="true" />
+            <element signature="e#6689#6690#0" expanded="true" />
+            <element signature="e#6727#6728#0" expanded="true" />
+            <element signature="e#6796#6797#0" expanded="true" />
+            <element signature="e#6829#6830#0" expanded="true" />
+            <element signature="e#6881#6882#0" expanded="true" />
+            <element signature="e#6925#6926#0" expanded="true" />
+            <element signature="e#6995#6996#0" expanded="true" />
+            <element signature="e#7030#7031#0" expanded="true" />
+            <element signature="e#7086#7087#0" expanded="true" />
+            <element signature="e#7134#7135#0" expanded="true" />
+            <element signature="e#7202#7203#0" expanded="true" />
+            <element signature="e#7233#7234#0" expanded="true" />
+            <element signature="e#7281#7282#0" expanded="true" />
+            <element signature="e#7321#7322#0" expanded="true" />
+            <element signature="e#7390#7391#0" expanded="true" />
+            <element signature="e#7426#7427#0" expanded="true" />
+            <element signature="e#7484#7485#0" expanded="true" />
+            <element signature="e#7534#7535#0" expanded="true" />
+            <element signature="e#7602#7603#0" expanded="true" />
+            <element signature="e#7636#7637#0" expanded="true" />
+            <element signature="e#7690#7691#0" expanded="true" />
+            <element signature="e#7736#7737#0" expanded="true" />
+            <element signature="e#7806#7807#0" expanded="true" />
+            <element signature="e#7840#7841#0" expanded="true" />
+            <element signature="e#7894#7895#0" expanded="true" />
+            <element signature="e#7940#7941#0" expanded="true" />
+            <element signature="e#8006#8007#0" expanded="true" />
+            <element signature="e#8036#8037#0" expanded="true" />
+            <element signature="e#8082#8083#0" expanded="true" />
+            <element signature="e#8120#8121#0" expanded="true" />
+            <element signature="e#8189#8190#0" expanded="true" />
+            <element signature="e#8226#8227#0" expanded="true" />
+            <element signature="e#8286#8287#0" expanded="true" />
+            <element signature="e#8338#8339#0" expanded="true" />
+            <element signature="e#8417#8418#0" expanded="true" />
+            <element signature="e#8457#8458#0" expanded="true" />
+            <element signature="e#8523#8524#0" expanded="true" />
+            <element signature="e#8581#8582#0" expanded="true" />
+            <element signature="e#8655#8656#0" expanded="true" />
+            <element signature="e#8687#8688#0" expanded="true" />
+            <element signature="e#8737#8738#0" expanded="true" />
+            <element signature="e#8779#8780#0" expanded="true" />
+            <element signature="e#8846#8847#0" expanded="true" />
+            <element signature="e#8879#8880#0" expanded="true" />
+            <element signature="e#8931#8932#0" expanded="true" />
+            <element signature="e#8975#8976#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#787#788#0" expanded="true" />
+            <element signature="e#817#818#0" expanded="true" />
+            <element signature="e#2105#2106#0" expanded="true" />
+            <element signature="e#2135#2136#0" expanded="true" />
+            <element signature="e#2431#2432#0" expanded="true" />
+            <element signature="e#2461#2462#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index 854f1f1..0db633a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -165,12 +165,16 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String startDay,String endDay) {
+    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew) {
         try {
 
             Criteria criteria = createCriteria(PgAlarm.class);
             criteria.addOrder(Order.desc("id"));
 
+            if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) {
+                criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
+            }
+
             if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay))
             {
                 criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay)));
@@ -193,9 +197,11 @@
 
                 criteria.add(Restrictions.le("alarmDate",date));
             }
+            if(StringUtils.isNotBlank(isNew)&&isNew.equals("true"))
+                criteria.add(Restrictions.eq("active", 1));
 
             List<PgAlarm> pgAlarmList = criteria.list();
-            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
     }
 
     //根据设备位置(仓位)获取摄像机列表
-    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+    public List<PgDeviceDto> getPgCameraListByPosition(String partition,String position){
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.like("position",position+"%"));
-//        criteria.add(Restrictions.eq("devType","球机"));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(position))
+            criteria.add(Restrictions.like("position",position+"%"));
+
         criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
 
         List<PgDevice> pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
             dto.setDevCode(objects[5].toString());
             dto.setDevType(objects[6].toString());
             if(objects[7]!=null)
-            dto.setIp(objects[7].toString());
+                dto.setIp(objects[7].toString());
             dto.setIsOpen(objects[8].toString());
             dto.setPartition(objects[11].toString());
             dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index 8ebf74d..3c657a7 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgEquipment;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
 import com.casic.PgInterface.devTable.dto.PgEquipmentDto;
@@ -34,9 +35,12 @@
     public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
-        criteria.add(Restrictions.eq("eqName",eqName));
-        criteria.add(Restrictions.eq("eqCode",eqCode));
-        criteria.add(Restrictions.eq("eqType",eqType));
+        if(StringUtils.isNotBlank(eqName))
+            criteria.add(Restrictions.eq("eqName",eqName));
+        if(StringUtils.isNotBlank(eqCode))
+            criteria.add(Restrictions.eq("eqCode",eqCode));
+        if(StringUtils.isNotBlank(eqType))
+            criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
@@ -51,10 +55,9 @@
 
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
-        //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
         String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
-        +eqType+"' group by equipment.EQ_NAME";
+                +eqType+"' group by equipment.EQ_NAME";
 
         List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4ed68e4..e413a5c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
@@ -39,7 +40,8 @@
 
     public List<PgPipeLineDto> getPipeLineByLineType(String lineType) {
         Criteria criteria = createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineType", lineType));
+        if(StringUtils.isNotBlank(lineType))
+            criteria.add(Restrictions.eq("lineType", lineType));
 
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    private Long id;
-    private String keyId;//巡检记录单id
-    private String planId;//巡检计划ID
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    @Column(name="KEY_ID")
-    public String getKeyId() {
-        return keyId;
-    }
-
-    public void setKeyId(String keyId) {
-        this.keyId = keyId;
-    }
-
-    @Column(name="PLAN_ID")
-    public String getPlanId() {
-        return planId;
-    }
-
-    public void setPlanId(String planId) {
-        this.planId = planId;
-    }
-
-    @Column(name="CREATE_DATE")
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    @Column(name="STATE")
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    @Column(name="CREATOR")
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    @Column(name="PLAN_NAME")
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    @Column(name="RECORD_NO")
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    @Column(name="PLAN_NO")
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    @Column(name="RESPONSIBIE_DEPT")
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    @Column(name="INSPECTION_PERSON")
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    @Column(name="PATROL_MAN")
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    @Column(name="OPERATE_DATE")
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    @Column(name="REMARK")
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Column(name="BUILD_CABIN")
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    @Column(name="PROJECT")
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    @Column(name="START_PILE_NO")
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    @Column(name="END_PILE_NO")
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    @Column(name="INSPECTION_PRACE")
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    @Column(name="OTHER_PATROL_MAN")
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private Long id;
+    private String KEY_ID;//唯一键值
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_PERSON;//巡检人
+    private String START_DATE;//巡检开始时间
+    private String END_DATE;
+    private String FREQUENCY;//巡检频率
+    private String STATE;//状态
+    private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+    private String PLAN_NO;//巡检计划编号
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_MODE;//巡检方式
+    private String INSPECTION_ROUTE;//巡检路线
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String INSPECTION_GROUP;//巡检部门
+    private String INSERT_TIME;//插入时间
+    private String FREQUENCYDATE;//巡检具体日期
+    private String FREQUENCYTIME;//巡检具体时间
+    private String CREATEDATE;//创建时间
+    private String CREATOR;//创建人
+    private String PROJECT;//项目
+    private String COMLILE;//编制人
+    private String START_TIME;//编制时间
+    private String DEVELOP_DEPT;//制定部门
+    private String END_TIME;//结束时间
+    private String START_PILE_NO;//开始桩号
+    private String END_PILE_NO;//结束桩号
+    private String BUILD_CABIN;//巡检舱室
+    private String MILEAGE;
+    private String FREQUENCY_TIME;//巡检具体时间
+    private String FREQUENCYTIME_END;
+    private String KETTLE_TS;
+    private String UPDATEDATE;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="KEY_ID")
+    public String getKEY_ID() {
+        return KEY_ID;
+    }
+
+    public void setKEY_ID(String KEY_ID) {
+        this.KEY_ID = KEY_ID;
+    }
+
+    @Column(name="PLAN_NAME")
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    @Column(name="INSPECTION_PERSON")
+    public String getINSPECTION_PERSON() {
+        return INSPECTION_PERSON;
+    }
+
+    public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+        this.INSPECTION_PERSON = INSPECTION_PERSON;
+    }
+
+    @Column(name="START_DATE")
+    public String getSTART_DATE() {
+        return START_DATE;
+    }
+
+    public void setSTART_DATE(String START_DATE) {
+        this.START_DATE = START_DATE;
+    }
+
+    @Column(name="END_DATE")
+    public String getEND_DATE() {
+        return END_DATE;
+    }
+
+    public void setEND_DATE(String END_DATE) {
+        this.END_DATE = END_DATE;
+    }
+
+    @Column(name="FREQUENCY")
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    @Column(name="STATE")
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    @Column(name="RESPONSIBLE_DEPT")
+    public String getRESPONSIBLE_DEPT() {
+        return RESPONSIBLE_DEPT;
+    }
+
+    public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+        this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+    }
+
+    @Column(name="PLAN_NO")
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    @Column(name="INSPECTION_TYPE")
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    @Column(name="INSPECTION_MODE")
+    public String getINSPECTION_MODE() {
+        return INSPECTION_MODE;
+    }
+
+    public void setINSPECTION_MODE(String INSPECTION_MODE) {
+        this.INSPECTION_MODE = INSPECTION_MODE;
+    }
+
+    @Column(name="INSPECTION_ROUTE")
+    public String getINSPECTION_ROUTE() {
+        return INSPECTION_ROUTE;
+    }
+
+    public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+        this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+    }
+
+    @Column(name="INSPECTION_START_TIME")
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    @Column(name="INSPECTION_END_TIME")
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    @Column(name="INSPECTION_PRACE")
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    @Column(name="INSPECTION_GROUP")
+    public String getINSPECTION_GROUP() {
+        return INSPECTION_GROUP;
+    }
+
+    public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+        this.INSPECTION_GROUP = INSPECTION_GROUP;
+    }
+
+    @Column(name="INSERT_TIME")
+    public String getINSERT_TIME() {
+        return INSERT_TIME;
+    }
+
+    public void setINSERT_TIME(String INSERT_TIME) {
+        this.INSERT_TIME = INSERT_TIME;
+    }
+
+    @Column(name="FREQUENCYDATE")
+    public String getFREQUENCYDATE() {
+        return FREQUENCYDATE;
+    }
+
+    public void setFREQUENCYDATE(String FREQUENCYDATE) {
+        this.FREQUENCYDATE = FREQUENCYDATE;
+    }
+
+    @Column(name="FREQUENCYTIME")
+    public String getFREQUENCYTIME() {
+        return FREQUENCYTIME;
+    }
+
+    public void setFREQUENCYTIME(String FREQUENCYTIME) {
+        this.FREQUENCYTIME = FREQUENCYTIME;
+    }
+
+    @Column(name="CREATEDATE")
+    public String getCREATEDATE() {
+        return CREATEDATE;
+    }
+
+    public void setCREATEDATE(String CREATEDATE) {
+        this.CREATEDATE = CREATEDATE;
+    }
+
+    @Column(name="CREATOR")
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    @Column(name="PROJECT")
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    @Column(name="COMLILE")
+    public String getCOMLILE() {
+        return COMLILE;
+    }
+
+    public void setCOMLILE(String COMLILE) {
+        this.COMLILE = COMLILE;
+    }
+
+    @Column(name="START_TIME")
+    public String getSTART_TIME() {
+        return START_TIME;
+    }
+
+    public void setSTART_TIME(String START_TIME) {
+        this.START_TIME = START_TIME;
+    }
+
+    @Column(name="DEVELOP_DEPT")
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    @Column(name="END_TIME")
+    public String getEND_TIME() {
+        return END_TIME;
+    }
+
+    public void setEND_TIME(String END_TIME) {
+        this.END_TIME = END_TIME;
+    }
+
+    @Column(name="START_PILE_NO")
+    public String getSTART_PILE_NO() {
+        return START_PILE_NO;
+    }
+
+    public void setSTART_PILE_NO(String START_PILE_NO) {
+        this.START_PILE_NO = START_PILE_NO;
+    }
+
+    @Column(name="END_PILE_NO")
+    public String getEND_PILE_NO() {
+        return END_PILE_NO;
+    }
+
+    public void setEND_PILE_NO(String END_PILE_NO) {
+        this.END_PILE_NO = END_PILE_NO;
+    }
+
+    @Column(name="BUILD_CABIN")
+    public String getBUILD_CABIN() {
+        return BUILD_CABIN;
+    }
+
+    public void setBUILD_CABIN(String BUILD_CABIN) {
+        this.BUILD_CABIN = BUILD_CABIN;
+    }
+
+    @Column(name="MILEAGE")
+    public String getMILEAGE() {
+        return MILEAGE;
+    }
+
+    public void setMILEAGE(String MILEAGE) {
+        this.MILEAGE = MILEAGE;
+    }
+
+    @Column(name="FREQUENCY_TIME")
+    public String getFREQUENCY_TIME() {
+        return FREQUENCY_TIME;
+    }
+
+    public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+        this.FREQUENCY_TIME = FREQUENCY_TIME;
+    }
+
+    @Column(name="FREQUENCYTIME_END")
+    public String getFREQUENCYTIME_END() {
+        return FREQUENCYTIME_END;
+    }
+
+    public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+        this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+    }
+
+    @Column(name="KETTLE_TS")
+    public String getKETTLE_TS() {
+        return KETTLE_TS;
+    }
+
+    public void setKETTLE_TS(String KETTLE_TS) {
+        this.KETTLE_TS = KETTLE_TS;
+    }
+
+    @Column(name="UPDATEDATE")
+    public String getUPDATEDATE() {
+        return UPDATEDATE;
+    }
+
+    public void setUPDATEDATE(String UPDATEDATE) {
+        this.UPDATEDATE = UPDATEDATE;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 5346b57..2f8d359 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -66,7 +66,7 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REPAIRMAN")
+    @Column(name="REOAIRMAN")
     public String getRepairMan() {
         return repairMan;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
-    private Long id;
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-
-
-    public static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
-        PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
-        pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
-        pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
-        pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
-        pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
-        pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
-        pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
-        pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
-        pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
-        pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
-        pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
-        pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
-        pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
-        pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
-        pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
-        return pgAssetInSpectionRecordDto;
-    }
-
-
-    public static List<PgAssetInSpectionRecordDto> ConvertToDtoList(List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList){
-        List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-        for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
-            pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
-        }
-
-        return pgAssetInSpectionRecordDtoList;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
-    private String num;
-    private String createDate;
-
-    public String getNum() {
-        return num;
-    }
-
-    public void setNum(String num) {
-        this.num = num;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+    private Long id;
+    private String PLAN_NO;//巡检计划编号
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String FREQUENCY;//巡检频率
+    private String CREATOR;//创建人
+    private String DEVELOP_DEPT;//制定部门
+    private String PROJECT;//项目
+    private String STATE;//状态
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+        PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+        pgAssetPlanDto.setId(pgAssetPlan.getId());
+        pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+        pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+        pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+        pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+        pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+        pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+        pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+        pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+        pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+        pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+        pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+        return pgAssetPlanDto;
+    }
+
+    public static List<PgAssetPlanDto> ConvertToPgAssetDtoList(List<PgAssetPlan> pgAssetPlanList){
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
+
+        for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+            pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+        }
+
+        return pgAssetPlanDtoList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
new file mode 100644
index 0000000..bc12db1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
@@ -0,0 +1,24 @@
+package com.casic.PgInterface.maintenance.dto;
+
+public class PgAssetPlanStatic {
+
+    private String num;
+    private String createDate;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
deleted file mode 100644
index c41ca7d..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.casic.PgInterface.maintenance.manager;
-
-import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
-
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
-        try {
-            String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
-                    "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
-                    "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-
-            if(patrolMan!=null)
-                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
-            if(startTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
-            if(endTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')<to_date('"+endTime+"','yyyy-MM-dd')";
-
-            sql+=" order by id";
-
-            List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
-
-            List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList=new ArrayList<>();
-            for(Object[] objects1:objects){
-                PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord();
-
-                pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString()));
-                pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1]));
-                pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2]));
-                pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3]));
-                pgAssetInSpectionRecord.setState(String.valueOf(objects1[4]));
-                pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5]));
-                pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6]));
-                pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7]));
-                pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8]));
-                pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9]));
-                pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10]));
-                pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11]));
-                pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12]));
-                pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13]));
-                pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14]));
-                pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15]));
-                pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16]));
-                pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17]));
-                pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18]));
-                pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19]));
-
-                pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord);
-            }
-
-            List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-            for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList)
-            {
-                pgAssetInSpectionRecordDtoList.add(PgAssetInSpectionRecordDto.ConvertToDto(pgAssetInSpectionRecord));
-            }
-
-            return pgAssetInSpectionRecordDtoList;
-        }
-        catch(Exception e)
-        {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public List<PgAssetInSpectionRecordStatic> getPgAssetInSpectionRecordStaticLisByTime(
-            String startTime, String endTime, String staticType) {
-
-        String sql="";
-        String dateType="";
-        List<PgAssetInSpectionRecordStatic> pgAssetInSpectionRecordStaticList=new ArrayList<>();
-        int type=Integer.valueOf(staticType);
-
-        switch(type) {
-            case 0://年
-                dateType = "yyyy";
-                break;
-            case 1://月
-                dateType = "yyyy-mm";
-                break;
-            case 2://周
-                dateType = "iw";
-                break;
-            case 3://日
-                dateType="yyyy-mm-dd";
-                break;
-            default:
-                break;
-        }
-
-        sql="select count(*), to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_RECORD t where 1=1";
-
-        if(startTime!=null)
-            sql+=" and t.CREATE_DATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
-        if(endTime!=null)
-            sql+=" and t.CREATE_DATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
-
-        sql+=" group by to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"')";
-
-        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
-        for(int i=0;i<objects.size();i++)
-        {
-            PgAssetInSpectionRecordStatic pgAssetInSpectionRecordStatic=new PgAssetInSpectionRecordStatic();
-            pgAssetInSpectionRecordStatic.setNum(objects.get(i)[0].toString());
-            pgAssetInSpectionRecordStatic.setCreateDate(objects.get(i)[1].toString());
-            pgAssetInSpectionRecordStaticList.add(pgAssetInSpectionRecordStatic);
-        }
-        return pgAssetInSpectionRecordStaticList;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
new file mode 100644
index 0000000..bb6bf1e
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
@@ -0,0 +1,81 @@
+package com.casic.PgInterface.maintenance.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgAssetPlanManager extends HibernateEntityDao<PgAssetPlan> {
+
+    public List<PgAssetPlanDto> getPgAssetPlanDtoList(String inSpectionPlace){
+        Criteria criteria=createCriteria(PgAssetPlan.class);
+
+        if(StringUtils.isNotBlank(inSpectionPlace))
+            criteria.add(Restrictions.like("INSPECTION_PRACE","%"+inSpectionPlace+"%"));
+        criteria.addOrder(Order.desc("id"));
+
+        List<PgAssetPlan> pgAssetPlanList=criteria.list();
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=PgAssetPlanDto.ConvertToPgAssetDtoList(pgAssetPlanList);
+
+        if(pgAssetPlanDtoList==null||pgAssetPlanDtoList.size()==0)
+            return null;
+        else
+            return pgAssetPlanDtoList;
+    }
+
+    public List<PgAssetPlanStatic> getPgAssetPlanStaticLisByTime(
+            String startTime, String endTime, String staticType) {
+
+        String sql="";
+        String dateType="";
+        List<PgAssetPlanStatic> pgAssetPlanStaticList=new ArrayList<>();
+        int type=Integer.valueOf(staticType);
+
+        switch(type) {
+            case 0://年
+                dateType = "yyyy";
+                break;
+            case 1://月
+                dateType = "yyyy-mm";
+                break;
+            case 2://周
+                dateType = "iw";
+                break;
+            case 3://日
+                dateType="yyyy-mm-dd";
+                break;
+            default:
+                break;
+        }
+
+        sql="select count(*), to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_PLAN t where 1=1";
+
+        if(startTime!=null)
+            sql+=" and t.CREATEDATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
+        if(endTime!=null)
+            sql+=" and t.CREATEDATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
+
+        sql+=" group by to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"')";
+
+        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
+        for(int i=0;i<objects.size();i++)
+        {
+            PgAssetPlanStatic pgAssetPlanStatic=new PgAssetPlanStatic();
+            pgAssetPlanStatic.setNum(objects.get(i)[0].toString());
+            pgAssetPlanStatic.setCreateDate(objects.get(i)[1].toString());
+            pgAssetPlanStaticList.add(pgAssetPlanStatic);
+        }
+        return pgAssetPlanStaticList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 0903f22..3484739 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -15,7 +15,7 @@
 
     public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
             if(repairMan!=null)
                 sql+=" and REPAIRMAN like '%"+repairMan+"%'";
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index 9cc2881..6d90d7b 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -1,5 +1,7 @@
 package com.casic.PgInterface.patroler.dto;
 
+import com.casic.PgInterface.devTable.domain.PgDevice;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 
 /**
@@ -14,6 +16,7 @@
     private String unit;//单位
     private String alarmType;//报警类型
     private Long pgDeviceId;//设备编号
+    private String assetCode;//资产编号
 
     public Long getId() {
         return id;
@@ -71,7 +74,15 @@
         this.pgDeviceId = pgDeviceId;
     }
 
-    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
+    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule, PgDeviceManager pgDeviceManager) {
         this.setId(pgAlarmRule.getId());
         this.setHighValue(pgAlarmRule.getHighValue());
         this.setLowValue(pgAlarmRule.getLowValue());
@@ -82,6 +93,10 @@
         else
             this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
         this.setPgDeviceId(pgAlarmRule.getPgDeviceId());
+        if(pgAlarmRule.getAlarmTypeId()!=null&&pgDeviceManager.get(pgAlarmRule.getPgDeviceId())!=null)
+            this.setAssetCode(pgDeviceManager.get(pgAlarmRule.getPgDeviceId()).getAssetCode());
+        else
+            this.setAssetCode("");
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
index c132c98..a7cef5b 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
@@ -1,13 +1,17 @@
 package com.casic.PgInterface.patroler.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.ResponseStatus;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -17,30 +21,23 @@
 @Service
 public class PgAlarmRuleManager extends HibernateEntityDao<PgAlarmRule> {
 
+    @Resource
+    private PgDeviceManager pgDeviceManager;
+
     //根据设备获取设备报警阈值
-    public List<PgAlarmRuleDto>  getAlarmRuleDto() {
+    public List<PgAlarmRuleDto>  getAlarmRuleDto(String devType) {
         Criteria criteria=createCriteria(PgAlarmRule.class);
+
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.eq("devType", devType));
         criteria.addOrder(Order.desc("id"));
 
         List<PgAlarmRule> pgAlarmRuleList=criteria.list();
-        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
+        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         for (PgAlarmRule pgAlarmRule : pgAlarmRuleList) {
-            pgAlarmRuleDtoList.add(new PgAlarmRuleDto(pgAlarmRule));
+            pgAlarmRuleDtoList.add(new PgAlarmRuleDto(pgAlarmRule,pgDeviceManager));
         }
         return pgAlarmRuleDtoList;
-
     }
 
-    public PgAlarmRule getAlarmRuleBydevType(String devType) {
-        Criteria criteria=createCriteria(PgAlarmRule.class);
-        criteria.add(Restrictions.eq("devType", devType));
-
-        List<PgAlarmRule> pgAlarmRuleList=criteria.list();
-
-        if(pgAlarmRuleList==null||pgAlarmRuleList.size()==0)
-            return null;
-        else
-            return pgAlarmRuleList.get(0);
-    }
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index d0e28f5..082ba5d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgAlarm;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
@@ -39,7 +40,7 @@
     private PgReservePlanManager pgReservePlanManager;
 
     /*
-    * 获取报警设备信息
+     * 获取报警设备信息
      */
     @POST
     @Path("linkDevice")
@@ -50,11 +51,22 @@
 
         PgDeviceDto pgDeviceDto = null;
         try {
-            PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
-            PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
-
-            pgDeviceDto=new PgDeviceDto(pgDevice);
-            msg = "报警关联设备获取成功";
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if (pgAlarm == null)
+                    msg = "不存在报警信息";
+                else {
+                    PgDevice pgDevice = pgAlarm.getAlarmDevId();
+                    if (pgDevice == null)
+                        msg = "不存在报警设备";
+                    else {
+                        pgDeviceDto = new PgDeviceDto(pgDevice);
+                        msg = "报警关联设备获取成功";
+                    }
+                }
+            }
+            else
+                msg="未接受到报警设备ID信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取关联设备失败";
@@ -77,11 +89,28 @@
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
-            PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
-            PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
-            pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if(pgAlarm==null)
+                    msg="不存在报警信息";
+                else {
+                    PgDevice pgDevice = pgAlarm.getAlarmDevId();
+                    if (pgDevice == null)
+                        msg = "不存在报警设备";
+                    else {
+                        String strPosition=pgDevice.getPosition();
+                        String position="";
+                        if(!strPosition.equals(""))
+                            position=pgDevice.getPosition().substring(0,3);
+                        String partition=pgDevice.getPartition();
 
-            msg = "关联设备获取成功";
+                        pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
+                        msg = "关联设备获取成功";
+                    }
+                }
+            }
+            else
+                msg="请输入报警设备Id信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "分区设备关联失败";
@@ -93,7 +122,7 @@
 
     /*
      * 根据报警记录获取关联的预案
-    */
+     */
     @POST
     @Path("linkReservePlan")
     @Produces(MediaType.APPLICATION_JSON)
@@ -103,10 +132,21 @@
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
-            PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
-            pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if (pgAlarm == null)
+                    msg = "不存在报警信息";
+                else {
+                    pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-            msg="关联预案获取成功";
+                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
+                        msg="不存在关联的报警预案";
+                    else
+                        msg = "关联预案获取成功";
+                }
+            }
+            else
+                msg="请输入报警信息";
         }
         catch(Exception e)
         {
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index d18ebb8..baacd93 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -48,14 +48,16 @@
     @POST
     @Path("getAlarmInfo")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmList(@FormParam("startDay") String startDay,
-                                            @FormParam("endDay") String endDay) throws Exception {
+    public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
+                                            @FormParam("startDay") String startDay,
+                                            @FormParam("endDay") String endDay,
+                                            @FormParam("isNew") String isNew) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(startDay,endDay);
-            if (pgAlarmDtoList.size() == 0)
+            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew);
+            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
                 msg = "没有报警信息";
             else
                 msg = "报警信息获取成功";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 87afd54..29ce8a4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -1,7 +1,5 @@
 package com.casic.PgInterface.rs;
 
-import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager;
-import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import com.casic.PgInterface.patroler.manager.PgAlarmRuleManager;
@@ -30,119 +28,23 @@
     private static Logger logger = LoggerFactory.getLogger(PgAlarmRule.class);
 
     @Resource
-    private PgDeviceManager pgDeviceManager;
-    @Resource
-    private PgAlarmTypeManager pgAlarmTypeManager;
-    @Resource
     private PgAlarmRuleManager pgAlarmRuleManager;
 
-
-
-    /**
-     * 新增报警阈值
-     */
-    @POST
-    @Path("addAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> addAlarmRule(@FormParam("highValue") String highValue,
-                                            @FormParam("lowValue") String lowValue,
-                                            @FormParam("unit") String unit,
-                                            @FormParam("devType") String devType,
-                                            @FormParam("alarmType") String alarmType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType);
-            if (pgAlarmRule != null) {
-                result = "false";
-                msg = "设备阈值已经存在";
-            } else {
-                pgAlarmRule = new PgAlarmRule();
-                pgAlarmRule.setHighValue(highValue);
-                pgAlarmRule.setLowValue(lowValue);
-                pgAlarmRule.setDevType(devType);
-                pgAlarmRule.setUnit(unit);
-                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
-
-                pgAlarmRuleManager.save(pgAlarmRule);
-                result = "true";
-                msg = "报警阈值新增成功";
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = "false";
-            msg = "报警阈值新增失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-        return resultMap;
-    }
-
-    /**
-     * 编辑报警阈值
-     */
-    @POST
-    @Path("editAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> editAlarmRule(@FormParam("id") String id,
-                                             @FormParam("devType") String devType,
-                                             @FormParam("highValue") String highValue,
-                                             @FormParam("lowValue") String lowValue,
-                                             @FormParam("unit") String unit,
-                                             @FormParam("alarmType") String alarmType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
-            if (pgAlarmRule == null) {
-                msg = "不存在报警阈值记录";
-                result = "false";
-            } else {
-                pgAlarmRule.setDevType(devType);
-                pgAlarmRule.setHighValue(highValue);
-                pgAlarmRule.setLowValue(lowValue);
-                pgAlarmRule.setUnit(unit);
-                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
-
-                pgAlarmRuleManager.save(pgAlarmRule);
-                msg = "编辑成功";
-                result = "true";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            result = "false";
-            msg = "报警阈值编辑失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-
-        return resultMap;
-    }
-
     /**
      * 获取报警阈值信息
      */
     @POST
     @Path("getAlarmRule")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmRule() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+    public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
+        System.out.println("devType:"+devType);
+        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
-            pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto();
-            if (pgAlarmRuleDtoList == null)
+            pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
+            if (pgAlarmRuleDtoList == null||pgAlarmRuleDtoList.size()==0)
                 msg = "不存在报警阈值信息";
             else
                 msg = "报警阈值获取成功";
@@ -155,69 +57,4 @@
         return resultMap;
     }
 
-    /**
-     * 删除报警阈值
-     */
-    @POST
-    @Path("deleteAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> deleteAlarmRule(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
-            if (pgAlarmRule == null) {
-                msg = "不存在报警阈值记录";
-                result = "false";
-            } else {
-                pgAlarmRuleManager.remove(pgAlarmRule);
-                msg = "删除成功";
-                result = "true";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            result = "false";
-            msg = "报警阈值删除失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-
-        return resultMap;
-    }
-
-    /**
-     * 根据设备类型报警阈值
-     */
-    @POST
-    @Path("getAlarmRuleByDevType")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmRuleByDevType(@FormParam("devType") String devType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        PgAlarmRule pgAlarmRule = null;
-        List<PgAlarmRuleDto> pgAlarmRuleDtos = new ArrayList<>();
-        try {
-            pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType);
-            if (pgAlarmRule == null)
-                msg = "不存在报警阈值记录";
-            else {
-                PgAlarmRuleDto pgAlarmRuleDto= new PgAlarmRuleDto(pgAlarmRule);
-                pgAlarmRuleDtos.add(pgAlarmRuleDto);
-                msg = "报警阈值获取成功";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            msg = "报警阈值获取失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmRuleDtos);
-
-        return resultMap;
-    }
-
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
new file mode 100644
index 0000000..19d3b8c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanRs")
+public class PgAssetPlanRs {
+
+    @Resource
+    private PgAssetPlanManager pgAssetPlanManager;
+
+    /**
+     * 获取巡检记录
+     */
+    @POST
+    @Path("getPgAssetPlanList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPgAssetPlanList(@FormParam("inSpectionPlace") String inSpectionPlace){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
+        try{
+            pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(inSpectionPlace);
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
+                msg="巡检信息获取成功";
+            else
+                msg="不存在巡检信息";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="巡检信息获取失败";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAssetPlanDtoList);
+
+        return resultMap;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
new file mode 100644
index 0000000..47ef9d1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanStaticRs")
+public class PgAssetPlanStaticRs {
+
+    @Resource
+    private PgAssetPlanManager pgAssetPlanManager;
+
+    @POST
+    @Path("getPgAssetPlanStaticList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPgAssetPlanStaticList(@FormParam("startTime") String startTime,
+                                                       @FormParam("endTime") String endTime,
+                                                       @FormParam("staticType") String staticType) throws Exception{
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
+        try{
+            pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
+                msg="巡检统计信息获取成功";
+            else
+                msg="统计信息获取失败";
+        }
+        catch (Exception ex){
+            ex.printStackTrace();
+            msg="统计失败";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAssetPlanStaticList);
+
+        return resultMap;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
deleted file mode 100644
index 66f4d09..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.manager.PgAssetInSpectionRecordManager;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@Path("pgAssetRecordRs")
-public class PgAssetRecordRs {
-
-    @Resource
-    private PgAssetInSpectionRecordManager pgAssetInSpectionRecordManager;
-
-    /**
-     * 获取巡检记录
-     */
-    @POST
-    @Path("getPgAssetRecordList")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgAssetRecordList(@FormParam("patrolMan") String patrolMan,
-                                                   @FormParam("startTime") String startTime,
-                                                   @FormParam("endTime") String endTime){
-        Map<String,Object> resultMap=new HashMap<>();
-        String msg="";
-
-        List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-        try{
-            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(patrolMan,startTime,endTime);
-            if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0)
-                msg="巡检信息获取成功";
-            else
-                msg="不存在巡检信息";
-        }
-        catch(Exception ex){
-            ex.printStackTrace();
-            msg="巡检信息获取失败";
-        }
-
-        resultMap.put("msg",msg);
-        resultMap.put("result",pgAssetInSpectionRecordDtoList);
-
-        return resultMap;
-    }
-
-}
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ff69e2a..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,27 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190828.docx" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -32,72 +42,119 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="2" />
-          <entry key="java" value="243" />
-          <entry key="properties" value="6" />
+          <entry key="java" value="321" />
+          <entry key="properties" value="8" />
           <entry key="xml" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
-          <entry key="JAVA" value="243" />
-          <entry key="Properties" value="6" />
+          <entry key="JAVA" value="321" />
+          <entry key="Properties" value="8" />
           <entry key="XML" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="8082" />
-          <entry key="properties" value="49" />
-          <entry key="txt" value="64" />
+          <entry key="dummy" value="16" />
+          <entry key="java" value="10723" />
+          <entry key="properties" value="59" />
+          <entry key="txt" value="118" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="8082" />
-          <entry key="PLAIN_TEXT" value="64" />
-          <entry key="Properties" value="49" />
+          <entry key="JAVA" value="10723" />
+          <entry key="PLAIN_TEXT" value="134" />
+          <entry key="Properties" value="59" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="4" />
+          <entry key="project.closed" value="28" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
           <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.24" value="1" />
+          <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="1" />
-          <entry key="project.open.time.3" value="3" />
-          <entry key="project.open.time.31" value="1" />
+          <entry key="project.open.time.28" value="1" />
+          <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.31" value="2" />
           <entry key="project.open.time.37" value="1" />
+          <entry key="project.open.time.39" value="2" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.40" value="1" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="1" />
+          <entry key="project.open.time.44" value="2" />
           <entry key="project.open.time.45" value="2" />
           <entry key="project.open.time.48" value="1" />
           <entry key="project.open.time.49" value="1" />
+          <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.58" value="1" />
           <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.71" value="1" />
+          <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.71" value="2" />
           <entry key="project.open.time.76" value="1" />
-          <entry key="project.opened" value="25" />
+          <entry key="project.opened" value="41" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+            <state relative-caret-position="174">
+              <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
               <folding>
-                <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-                <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="352">
+              <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#787#788#0" expanded="true" />
+                <element signature="e#817#818#0" expanded="true" />
+                <element signature="e#2105#2106#0" expanded="true" />
+                <element signature="e#2135#2136#0" expanded="true" />
+                <element signature="e#2431#2432#0" expanded="true" />
+                <element signature="e#2461#2462#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="638">
+              <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+              <folding>
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -122,6 +179,7 @@
       <find>getPgDeviceByDevType</find>
       <find>message</find>
       <find>getConstructionByType</find>
+      <find>getPgCameraListByPosition</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -130,24 +188,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanTypeDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
@@ -162,17 +207,38 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
       </list>
     </option>
   </component>
@@ -208,16 +274,18 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="3" />
-    <option name="y" value="10" />
-    <option name="width" value="1386" />
-    <option name="height" value="788" />
+    <option name="x" value="1410" />
+    <option name="y" value="117" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -258,7 +326,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -267,16 +335,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -286,7 +345,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="dto" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -296,7 +355,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="manager" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -308,19 +367,10 @@
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="webapp" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -359,6 +409,7 @@
       </deployment>
       <server-settings>
         <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_7" />
+        <option name="JNDI_PORT" value="10991" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -456,7 +507,23 @@
       <workItem from="1566350810712" duration="6803000" />
       <workItem from="1566435787074" duration="10717000" />
       <workItem from="1566521753529" duration="14265000" />
-      <workItem from="1566614176989" duration="5693000" />
+      <workItem from="1566614176989" duration="14059000" />
+      <workItem from="1566780822009" duration="1026000" />
+      <workItem from="1566891563975" duration="284000" />
+      <workItem from="1566893107340" duration="3382000" />
+      <workItem from="1566953794976" duration="11039000" />
+      <workItem from="1567059357700" duration="484000" />
+      <workItem from="1567082835097" duration="1086000" />
+      <workItem from="1567126428020" duration="1539000" />
+      <workItem from="1567129277820" duration="5788000" />
+      <workItem from="1567136008996" duration="2568000" />
+      <workItem from="1567237040302" duration="111000" />
+      <workItem from="1567495626345" duration="2797000" />
+      <workItem from="1567558770152" duration="2352000" />
+      <workItem from="1567577368149" duration="640000" />
+      <workItem from="1567751224608" duration="780000" />
+      <workItem from="1568019299799" duration="695000" />
+      <workItem from="1568082566133" duration="4016000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -493,17 +560,60 @@
       <option name="project" value="LOCAL" />
       <updated>1566553388171</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="整理管线部分">
+      <created>1566620046627</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1566620046627</updated>
+    </task>
+    <task id="LOCAL-00007" summary="合并代码提交">
+      <created>1566781001910</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1566781001910</updated>
+    </task>
+    <task id="LOCAL-00008" summary="合并代码提交">
+      <created>1566963831930</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1566963831930</updated>
+    </task>
+    <task id="LOCAL-00009" summary="修改报警阈值">
+      <created>1566972146710</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1566972146710</updated>
+    </task>
+    <task id="LOCAL-00010" summary="修改巡检维护表字段">
+      <created>1567126525554</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1567126525554</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="142930000" />
+    <option name="totallyTimeSpent" value="189883000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
+    <frame x="1358" y="-8" width="1456" height="916" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29297996" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -511,13 +621,14 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Thumbnails" weight="0.3295082" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.5081967" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.3849105" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
       <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
       <window_info anchor="bottom" id="Spring" order="8" />
       <window_info anchor="bottom" id="Terminal" order="9" />
@@ -539,7 +650,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2193646" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -547,22 +658,23 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.47540984" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
-      <window_info anchor="bottom" id="Spring" order="8" />
-      <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
-      <window_info anchor="bottom" id="Statistic" order="11" />
-      <window_info anchor="bottom" id="Java Enterprise" order="12" />
-      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="14" weight="0.32786885" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.52307695" />
+      <window_info anchor="bottom" id="Thumbnails" order="0" weight="0.3295082" />
+      <window_info anchor="bottom" id="Message" order="1" />
+      <window_info anchor="bottom" id="Find" order="2" />
+      <window_info anchor="bottom" id="Run" order="3" />
+      <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.49924356" weight="0.49344262" />
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Application Servers" order="8" weight="0.3276923" />
+      <window_info anchor="bottom" id="Spring" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
+      <window_info anchor="bottom" id="Statistic" order="12" />
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <window_info anchor="bottom" id="Database Changes" order="14" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="15" weight="0.32786885" />
+      <window_info anchor="bottom" id="Messages" order="16" weight="0.5229508" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -578,6 +690,16 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -587,7 +709,11 @@
     <MESSAGE value="修改权限问题" />
     <MESSAGE value="修改人员登录返回接口" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整理管线部分" />
+    <MESSAGE value="合并代码提交" />
+    <MESSAGE value="修改报警阈值" />
+    <MESSAGE value="修改巡检维护表字段" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护表字段" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -602,322 +728,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-532">
-          <caret line="50" column="28" lean-forward="true" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="19" column="60" selection-start-line="19" selection-start-column="60" selection-end-line="19" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="100" column="34" lean-forward="true" selection-start-line="100" selection-start-column="34" selection-end-line="100" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1474">
-          <caret line="84" column="58" selection-start-line="84" selection-start-column="58" selection-end-line="84" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1100">
-          <caret line="58" column="18" selection-start-line="58" selection-start-column="18" selection-end-line="58" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6842">
-          <caret line="329" selection-start-line="329" selection-end-line="329" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="102" column="24" lean-forward="true" selection-start-line="102" selection-start-column="24" selection-end-line="102" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="72" column="56" lean-forward="true" selection-start-line="72" selection-start-column="56" selection-end-line="72" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="90" column="39" lean-forward="true" selection-start-line="90" selection-start-column="39" selection-end-line="90" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="97" column="16" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
-          <caret line="14" column="52" lean-forward="true" selection-start-line="14" selection-start-column="52" selection-end-line="14" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="26" column="34" lean-forward="true" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="61" column="1" lean-forward="true" selection-start-line="61" selection-start-column="1" selection-end-line="61" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="208" column="49" lean-forward="true" selection-start-line="208" selection-start-column="49" selection-end-line="208" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="140" column="57" selection-start-line="140" selection-start-column="57" selection-end-line="140" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="111" column="36" selection-start-line="111" selection-start-column="36" selection-end-line="111" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="3" lean-forward="true" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="81" column="58" lean-forward="true" selection-start-line="81" selection-start-column="58" selection-end-line="81" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="472">
-          <caret line="118" column="59" selection-start-line="118" selection-start-column="59" selection-end-line="118" selection-end-column="59" />
-          <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-198">
-          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="69" column="32" lean-forward="true" selection-start-line="69" selection-start-column="32" selection-end-line="70" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="142" column="59" lean-forward="true" selection-start-line="142" selection-start-column="59" selection-end-line="142" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="349" column="9" lean-forward="true" selection-start-line="349" selection-start-column="9" selection-end-line="349" selection-end-column="9" />
-          <folding>
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="e#12105#12121#0" expanded="true" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-686">
-          <caret line="67" column="31" lean-forward="true" selection-start-line="67" selection-start-column="31" selection-end-line="67" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="93" column="24" lean-forward="true" selection-start-line="93" selection-start-column="24" selection-end-line="93" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="57" column="23" lean-forward="true" selection-start-line="57" selection-start-column="23" selection-end-line="57" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-408">
-          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="98" column="40" lean-forward="true" selection-start-line="98" selection-start-column="40" selection-end-line="98" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="572">
@@ -925,13 +735,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="328" column="32" lean-forward="true" selection-start-line="328" selection-start-column="32" selection-end-line="328" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
@@ -950,16 +753,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="396">
           <caret line="23" column="32" lean-forward="true" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
-          <folding>
-            <element signature="e#2635#2636#0" expanded="true" />
-            <element signature="e#2671#2672#0" expanded="true" />
-            <element signature="e#2727#2728#0" expanded="true" />
-            <element signature="e#2777#2778#0" expanded="true" />
-            <element signature="e#2877#2878#0" expanded="true" />
-            <element signature="e#2911#2912#0" expanded="true" />
-            <element signature="e#2963#2964#0" expanded="true" />
-            <element signature="e#3009#3010#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -972,14 +765,481 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+        <state relative-caret-position="66">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="59" column="46" lean-forward="true" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3586">
+          <caret line="179" column="16" selection-start-line="179" selection-start-column="16" selection-end-line="179" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5478">
+          <caret line="273" column="3" selection-start-line="273" selection-start-column="3" selection-end-line="273" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1870">
+          <caret line="147" column="11" selection-start-line="147" selection-start-column="11" selection-end-line="147" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="55" column="15" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="106">
+          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="290" column="41" lean-forward="true" selection-start-line="290" selection-start-column="41" selection-end-line="290" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="21" column="32" lean-forward="true" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="550">
+          <caret line="38" column="89" selection-start-line="38" selection-start-column="89" selection-end-line="38" selection-end-column="89" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="11" column="28" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1166">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="818">
+          <caret line="285" column="13" lean-forward="true" selection-start-line="285" selection-start-column="13" selection-end-line="285" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="129" column="31" lean-forward="true" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="323" column="72" lean-forward="true" selection-start-line="323" selection-start-column="72" selection-end-line="323" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="44" column="13" lean-forward="true" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-638">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="244">
+          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="157">
+          <caret line="16" column="55" lean-forward="true" selection-start-line="16" selection-start-column="55" selection-end-line="16" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="270" column="33" lean-forward="true" selection-start-line="270" selection-start-column="33" selection-end-line="270" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="490">
+          <caret line="141" selection-start-line="141" selection-end-line="141" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="164" column="5" lean-forward="true" selection-start-line="164" selection-start-column="5" selection-end-line="164" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/apiTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-242">
+          <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="61" column="16" lean-forward="true" selection-start-line="61" selection-start-column="16" selection-end-line="61" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="700">
+          <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="12" column="34" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="39" column="9" lean-forward="true" selection-start-line="39" selection-start-column="9" selection-end-line="39" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="32" column="29" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="29" />
           <folding>
-            <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-            <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#1838#1839#0" expanded="true" />
+            <element signature="e#1863#1864#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1925#1926#0" expanded="true" />
+            <element signature="e#1822#1823#0" expanded="true" />
+            <element signature="e#1851#1852#0" expanded="true" />
+            <element signature="e#1895#1896#0" expanded="true" />
+            <element signature="e#1931#1932#0" expanded="true" />
+            <element signature="e#2132#2133#0" expanded="true" />
+            <element signature="e#2164#2165#0" expanded="true" />
+            <element signature="e#2214#2215#0" expanded="true" />
+            <element signature="e#2256#2257#0" expanded="true" />
+            <element signature="e#2330#2331#0" expanded="true" />
+            <element signature="e#2370#2371#0" expanded="true" />
+            <element signature="e#2436#2437#0" expanded="true" />
+            <element signature="e#2494#2495#0" expanded="true" />
+            <element signature="e#2569#2570#0" expanded="true" />
+            <element signature="e#2602#2603#0" expanded="true" />
+            <element signature="e#2654#2655#0" expanded="true" />
+            <element signature="e#2698#2699#0" expanded="true" />
+            <element signature="e#2764#2765#0" expanded="true" />
+            <element signature="e#2795#2796#0" expanded="true" />
+            <element signature="e#2843#2844#0" expanded="true" />
+            <element signature="e#2883#2884#0" expanded="true" />
+            <element signature="e#2948#2949#0" expanded="true" />
+            <element signature="e#2980#2981#0" expanded="true" />
+            <element signature="e#3030#3031#0" expanded="true" />
+            <element signature="e#3072#3073#0" expanded="true" />
+            <element signature="e#3134#3135#0" expanded="true" />
+            <element signature="e#3162#3163#0" expanded="true" />
+            <element signature="e#3204#3205#0" expanded="true" />
+            <element signature="e#3238#3239#0" expanded="true" />
+            <element signature="e#3307#3308#0" expanded="true" />
+            <element signature="e#3346#3347#0" expanded="true" />
+            <element signature="e#3410#3411#0" expanded="true" />
+            <element signature="e#3466#3467#0" expanded="true" />
+            <element signature="e#3537#3538#0" expanded="true" />
+            <element signature="e#3567#3568#0" expanded="true" />
+            <element signature="e#3613#3614#0" expanded="true" />
+            <element signature="e#3651#3652#0" expanded="true" />
+            <element signature="e#3721#3722#0" expanded="true" />
+            <element signature="e#3759#3760#0" expanded="true" />
+            <element signature="e#3821#3822#0" expanded="true" />
+            <element signature="e#3875#3876#0" expanded="true" />
+            <element signature="e#3953#3954#0" expanded="true" />
+            <element signature="e#3991#3992#0" expanded="true" />
+            <element signature="e#4053#4054#0" expanded="true" />
+            <element signature="e#4107#4108#0" expanded="true" />
+            <element signature="e#4186#4187#0" expanded="true" />
+            <element signature="e#4225#4226#0" expanded="true" />
+            <element signature="e#4289#4290#0" expanded="true" />
+            <element signature="e#4345#4346#0" expanded="true" />
+            <element signature="e#4430#4431#0" expanded="true" />
+            <element signature="e#4474#4475#0" expanded="true" />
+            <element signature="e#4698#4699#0" expanded="true" />
+            <element signature="e#4740#4741#0" expanded="true" />
+            <element signature="e#4810#4811#0" expanded="true" />
+            <element signature="e#4872#4873#0" expanded="true" />
+            <element signature="e#4955#4956#0" expanded="true" />
+            <element signature="e#4994#4995#0" expanded="true" />
+            <element signature="e#5058#5059#0" expanded="true" />
+            <element signature="e#5114#5115#0" expanded="true" />
+            <element signature="e#5194#5195#0" expanded="true" />
+            <element signature="e#5233#5234#0" expanded="true" />
+            <element signature="e#5297#5298#0" expanded="true" />
+            <element signature="e#5353#5354#0" expanded="true" />
+            <element signature="e#5428#5429#0" expanded="true" />
+            <element signature="e#5462#5463#0" expanded="true" />
+            <element signature="e#5516#5517#0" expanded="true" />
+            <element signature="e#5562#5563#0" expanded="true" />
+            <element signature="e#5634#5635#0" expanded="true" />
+            <element signature="e#5670#5671#0" expanded="true" />
+            <element signature="e#5728#5729#0" expanded="true" />
+            <element signature="e#5778#5779#0" expanded="true" />
+            <element signature="e#5852#5853#0" expanded="true" />
+            <element signature="e#5888#5889#0" expanded="true" />
+            <element signature="e#5946#5947#0" expanded="true" />
+            <element signature="e#5996#5997#0" expanded="true" />
+            <element signature="e#6067#6068#0" expanded="true" />
+            <element signature="e#6100#6101#0" expanded="true" />
+            <element signature="e#6152#6153#0" expanded="true" />
+            <element signature="e#6196#6197#0" expanded="true" />
+            <element signature="e#6261#6262#0" expanded="true" />
+            <element signature="e#6291#6292#0" expanded="true" />
+            <element signature="e#6337#6338#0" expanded="true" />
+            <element signature="e#6375#6376#0" expanded="true" />
+            <element signature="e#6437#6438#0" expanded="true" />
+            <element signature="e#6467#6468#0" expanded="true" />
+            <element signature="e#6513#6514#0" expanded="true" />
+            <element signature="e#6551#6552#0" expanded="true" />
+            <element signature="e#6613#6614#0" expanded="true" />
+            <element signature="e#6643#6644#0" expanded="true" />
+            <element signature="e#6689#6690#0" expanded="true" />
+            <element signature="e#6727#6728#0" expanded="true" />
+            <element signature="e#6796#6797#0" expanded="true" />
+            <element signature="e#6829#6830#0" expanded="true" />
+            <element signature="e#6881#6882#0" expanded="true" />
+            <element signature="e#6925#6926#0" expanded="true" />
+            <element signature="e#6995#6996#0" expanded="true" />
+            <element signature="e#7030#7031#0" expanded="true" />
+            <element signature="e#7086#7087#0" expanded="true" />
+            <element signature="e#7134#7135#0" expanded="true" />
+            <element signature="e#7202#7203#0" expanded="true" />
+            <element signature="e#7233#7234#0" expanded="true" />
+            <element signature="e#7281#7282#0" expanded="true" />
+            <element signature="e#7321#7322#0" expanded="true" />
+            <element signature="e#7390#7391#0" expanded="true" />
+            <element signature="e#7426#7427#0" expanded="true" />
+            <element signature="e#7484#7485#0" expanded="true" />
+            <element signature="e#7534#7535#0" expanded="true" />
+            <element signature="e#7602#7603#0" expanded="true" />
+            <element signature="e#7636#7637#0" expanded="true" />
+            <element signature="e#7690#7691#0" expanded="true" />
+            <element signature="e#7736#7737#0" expanded="true" />
+            <element signature="e#7806#7807#0" expanded="true" />
+            <element signature="e#7840#7841#0" expanded="true" />
+            <element signature="e#7894#7895#0" expanded="true" />
+            <element signature="e#7940#7941#0" expanded="true" />
+            <element signature="e#8006#8007#0" expanded="true" />
+            <element signature="e#8036#8037#0" expanded="true" />
+            <element signature="e#8082#8083#0" expanded="true" />
+            <element signature="e#8120#8121#0" expanded="true" />
+            <element signature="e#8189#8190#0" expanded="true" />
+            <element signature="e#8226#8227#0" expanded="true" />
+            <element signature="e#8286#8287#0" expanded="true" />
+            <element signature="e#8338#8339#0" expanded="true" />
+            <element signature="e#8417#8418#0" expanded="true" />
+            <element signature="e#8457#8458#0" expanded="true" />
+            <element signature="e#8523#8524#0" expanded="true" />
+            <element signature="e#8581#8582#0" expanded="true" />
+            <element signature="e#8655#8656#0" expanded="true" />
+            <element signature="e#8687#8688#0" expanded="true" />
+            <element signature="e#8737#8738#0" expanded="true" />
+            <element signature="e#8779#8780#0" expanded="true" />
+            <element signature="e#8846#8847#0" expanded="true" />
+            <element signature="e#8879#8880#0" expanded="true" />
+            <element signature="e#8931#8932#0" expanded="true" />
+            <element signature="e#8975#8976#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#787#788#0" expanded="true" />
+            <element signature="e#817#818#0" expanded="true" />
+            <element signature="e#2105#2106#0" expanded="true" />
+            <element signature="e#2135#2136#0" expanded="true" />
+            <element signature="e#2431#2432#0" expanded="true" />
+            <element signature="e#2461#2462#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index 854f1f1..0db633a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -165,12 +165,16 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String startDay,String endDay) {
+    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew) {
         try {
 
             Criteria criteria = createCriteria(PgAlarm.class);
             criteria.addOrder(Order.desc("id"));
 
+            if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) {
+                criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
+            }
+
             if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay))
             {
                 criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay)));
@@ -193,9 +197,11 @@
 
                 criteria.add(Restrictions.le("alarmDate",date));
             }
+            if(StringUtils.isNotBlank(isNew)&&isNew.equals("true"))
+                criteria.add(Restrictions.eq("active", 1));
 
             List<PgAlarm> pgAlarmList = criteria.list();
-            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
     }
 
     //根据设备位置(仓位)获取摄像机列表
-    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+    public List<PgDeviceDto> getPgCameraListByPosition(String partition,String position){
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.like("position",position+"%"));
-//        criteria.add(Restrictions.eq("devType","球机"));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(position))
+            criteria.add(Restrictions.like("position",position+"%"));
+
         criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
 
         List<PgDevice> pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
             dto.setDevCode(objects[5].toString());
             dto.setDevType(objects[6].toString());
             if(objects[7]!=null)
-            dto.setIp(objects[7].toString());
+                dto.setIp(objects[7].toString());
             dto.setIsOpen(objects[8].toString());
             dto.setPartition(objects[11].toString());
             dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index 8ebf74d..3c657a7 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgEquipment;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
 import com.casic.PgInterface.devTable.dto.PgEquipmentDto;
@@ -34,9 +35,12 @@
     public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
-        criteria.add(Restrictions.eq("eqName",eqName));
-        criteria.add(Restrictions.eq("eqCode",eqCode));
-        criteria.add(Restrictions.eq("eqType",eqType));
+        if(StringUtils.isNotBlank(eqName))
+            criteria.add(Restrictions.eq("eqName",eqName));
+        if(StringUtils.isNotBlank(eqCode))
+            criteria.add(Restrictions.eq("eqCode",eqCode));
+        if(StringUtils.isNotBlank(eqType))
+            criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
@@ -51,10 +55,9 @@
 
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
-        //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
         String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
-        +eqType+"' group by equipment.EQ_NAME";
+                +eqType+"' group by equipment.EQ_NAME";
 
         List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4ed68e4..e413a5c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
@@ -39,7 +40,8 @@
 
     public List<PgPipeLineDto> getPipeLineByLineType(String lineType) {
         Criteria criteria = createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineType", lineType));
+        if(StringUtils.isNotBlank(lineType))
+            criteria.add(Restrictions.eq("lineType", lineType));
 
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    private Long id;
-    private String keyId;//巡检记录单id
-    private String planId;//巡检计划ID
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    @Column(name="KEY_ID")
-    public String getKeyId() {
-        return keyId;
-    }
-
-    public void setKeyId(String keyId) {
-        this.keyId = keyId;
-    }
-
-    @Column(name="PLAN_ID")
-    public String getPlanId() {
-        return planId;
-    }
-
-    public void setPlanId(String planId) {
-        this.planId = planId;
-    }
-
-    @Column(name="CREATE_DATE")
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    @Column(name="STATE")
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    @Column(name="CREATOR")
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    @Column(name="PLAN_NAME")
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    @Column(name="RECORD_NO")
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    @Column(name="PLAN_NO")
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    @Column(name="RESPONSIBIE_DEPT")
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    @Column(name="INSPECTION_PERSON")
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    @Column(name="PATROL_MAN")
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    @Column(name="OPERATE_DATE")
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    @Column(name="REMARK")
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Column(name="BUILD_CABIN")
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    @Column(name="PROJECT")
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    @Column(name="START_PILE_NO")
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    @Column(name="END_PILE_NO")
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    @Column(name="INSPECTION_PRACE")
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    @Column(name="OTHER_PATROL_MAN")
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private Long id;
+    private String KEY_ID;//唯一键值
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_PERSON;//巡检人
+    private String START_DATE;//巡检开始时间
+    private String END_DATE;
+    private String FREQUENCY;//巡检频率
+    private String STATE;//状态
+    private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+    private String PLAN_NO;//巡检计划编号
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_MODE;//巡检方式
+    private String INSPECTION_ROUTE;//巡检路线
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String INSPECTION_GROUP;//巡检部门
+    private String INSERT_TIME;//插入时间
+    private String FREQUENCYDATE;//巡检具体日期
+    private String FREQUENCYTIME;//巡检具体时间
+    private String CREATEDATE;//创建时间
+    private String CREATOR;//创建人
+    private String PROJECT;//项目
+    private String COMLILE;//编制人
+    private String START_TIME;//编制时间
+    private String DEVELOP_DEPT;//制定部门
+    private String END_TIME;//结束时间
+    private String START_PILE_NO;//开始桩号
+    private String END_PILE_NO;//结束桩号
+    private String BUILD_CABIN;//巡检舱室
+    private String MILEAGE;
+    private String FREQUENCY_TIME;//巡检具体时间
+    private String FREQUENCYTIME_END;
+    private String KETTLE_TS;
+    private String UPDATEDATE;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="KEY_ID")
+    public String getKEY_ID() {
+        return KEY_ID;
+    }
+
+    public void setKEY_ID(String KEY_ID) {
+        this.KEY_ID = KEY_ID;
+    }
+
+    @Column(name="PLAN_NAME")
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    @Column(name="INSPECTION_PERSON")
+    public String getINSPECTION_PERSON() {
+        return INSPECTION_PERSON;
+    }
+
+    public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+        this.INSPECTION_PERSON = INSPECTION_PERSON;
+    }
+
+    @Column(name="START_DATE")
+    public String getSTART_DATE() {
+        return START_DATE;
+    }
+
+    public void setSTART_DATE(String START_DATE) {
+        this.START_DATE = START_DATE;
+    }
+
+    @Column(name="END_DATE")
+    public String getEND_DATE() {
+        return END_DATE;
+    }
+
+    public void setEND_DATE(String END_DATE) {
+        this.END_DATE = END_DATE;
+    }
+
+    @Column(name="FREQUENCY")
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    @Column(name="STATE")
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    @Column(name="RESPONSIBLE_DEPT")
+    public String getRESPONSIBLE_DEPT() {
+        return RESPONSIBLE_DEPT;
+    }
+
+    public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+        this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+    }
+
+    @Column(name="PLAN_NO")
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    @Column(name="INSPECTION_TYPE")
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    @Column(name="INSPECTION_MODE")
+    public String getINSPECTION_MODE() {
+        return INSPECTION_MODE;
+    }
+
+    public void setINSPECTION_MODE(String INSPECTION_MODE) {
+        this.INSPECTION_MODE = INSPECTION_MODE;
+    }
+
+    @Column(name="INSPECTION_ROUTE")
+    public String getINSPECTION_ROUTE() {
+        return INSPECTION_ROUTE;
+    }
+
+    public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+        this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+    }
+
+    @Column(name="INSPECTION_START_TIME")
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    @Column(name="INSPECTION_END_TIME")
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    @Column(name="INSPECTION_PRACE")
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    @Column(name="INSPECTION_GROUP")
+    public String getINSPECTION_GROUP() {
+        return INSPECTION_GROUP;
+    }
+
+    public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+        this.INSPECTION_GROUP = INSPECTION_GROUP;
+    }
+
+    @Column(name="INSERT_TIME")
+    public String getINSERT_TIME() {
+        return INSERT_TIME;
+    }
+
+    public void setINSERT_TIME(String INSERT_TIME) {
+        this.INSERT_TIME = INSERT_TIME;
+    }
+
+    @Column(name="FREQUENCYDATE")
+    public String getFREQUENCYDATE() {
+        return FREQUENCYDATE;
+    }
+
+    public void setFREQUENCYDATE(String FREQUENCYDATE) {
+        this.FREQUENCYDATE = FREQUENCYDATE;
+    }
+
+    @Column(name="FREQUENCYTIME")
+    public String getFREQUENCYTIME() {
+        return FREQUENCYTIME;
+    }
+
+    public void setFREQUENCYTIME(String FREQUENCYTIME) {
+        this.FREQUENCYTIME = FREQUENCYTIME;
+    }
+
+    @Column(name="CREATEDATE")
+    public String getCREATEDATE() {
+        return CREATEDATE;
+    }
+
+    public void setCREATEDATE(String CREATEDATE) {
+        this.CREATEDATE = CREATEDATE;
+    }
+
+    @Column(name="CREATOR")
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    @Column(name="PROJECT")
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    @Column(name="COMLILE")
+    public String getCOMLILE() {
+        return COMLILE;
+    }
+
+    public void setCOMLILE(String COMLILE) {
+        this.COMLILE = COMLILE;
+    }
+
+    @Column(name="START_TIME")
+    public String getSTART_TIME() {
+        return START_TIME;
+    }
+
+    public void setSTART_TIME(String START_TIME) {
+        this.START_TIME = START_TIME;
+    }
+
+    @Column(name="DEVELOP_DEPT")
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    @Column(name="END_TIME")
+    public String getEND_TIME() {
+        return END_TIME;
+    }
+
+    public void setEND_TIME(String END_TIME) {
+        this.END_TIME = END_TIME;
+    }
+
+    @Column(name="START_PILE_NO")
+    public String getSTART_PILE_NO() {
+        return START_PILE_NO;
+    }
+
+    public void setSTART_PILE_NO(String START_PILE_NO) {
+        this.START_PILE_NO = START_PILE_NO;
+    }
+
+    @Column(name="END_PILE_NO")
+    public String getEND_PILE_NO() {
+        return END_PILE_NO;
+    }
+
+    public void setEND_PILE_NO(String END_PILE_NO) {
+        this.END_PILE_NO = END_PILE_NO;
+    }
+
+    @Column(name="BUILD_CABIN")
+    public String getBUILD_CABIN() {
+        return BUILD_CABIN;
+    }
+
+    public void setBUILD_CABIN(String BUILD_CABIN) {
+        this.BUILD_CABIN = BUILD_CABIN;
+    }
+
+    @Column(name="MILEAGE")
+    public String getMILEAGE() {
+        return MILEAGE;
+    }
+
+    public void setMILEAGE(String MILEAGE) {
+        this.MILEAGE = MILEAGE;
+    }
+
+    @Column(name="FREQUENCY_TIME")
+    public String getFREQUENCY_TIME() {
+        return FREQUENCY_TIME;
+    }
+
+    public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+        this.FREQUENCY_TIME = FREQUENCY_TIME;
+    }
+
+    @Column(name="FREQUENCYTIME_END")
+    public String getFREQUENCYTIME_END() {
+        return FREQUENCYTIME_END;
+    }
+
+    public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+        this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+    }
+
+    @Column(name="KETTLE_TS")
+    public String getKETTLE_TS() {
+        return KETTLE_TS;
+    }
+
+    public void setKETTLE_TS(String KETTLE_TS) {
+        this.KETTLE_TS = KETTLE_TS;
+    }
+
+    @Column(name="UPDATEDATE")
+    public String getUPDATEDATE() {
+        return UPDATEDATE;
+    }
+
+    public void setUPDATEDATE(String UPDATEDATE) {
+        this.UPDATEDATE = UPDATEDATE;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 5346b57..2f8d359 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -66,7 +66,7 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REPAIRMAN")
+    @Column(name="REOAIRMAN")
     public String getRepairMan() {
         return repairMan;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
-    private Long id;
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-
-
-    public static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
-        PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
-        pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
-        pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
-        pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
-        pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
-        pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
-        pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
-        pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
-        pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
-        pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
-        pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
-        pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
-        pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
-        pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
-        pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
-        return pgAssetInSpectionRecordDto;
-    }
-
-
-    public static List<PgAssetInSpectionRecordDto> ConvertToDtoList(List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList){
-        List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-        for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
-            pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
-        }
-
-        return pgAssetInSpectionRecordDtoList;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
-    private String num;
-    private String createDate;
-
-    public String getNum() {
-        return num;
-    }
-
-    public void setNum(String num) {
-        this.num = num;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+    private Long id;
+    private String PLAN_NO;//巡检计划编号
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String FREQUENCY;//巡检频率
+    private String CREATOR;//创建人
+    private String DEVELOP_DEPT;//制定部门
+    private String PROJECT;//项目
+    private String STATE;//状态
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+        PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+        pgAssetPlanDto.setId(pgAssetPlan.getId());
+        pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+        pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+        pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+        pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+        pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+        pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+        pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+        pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+        pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+        pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+        pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+        return pgAssetPlanDto;
+    }
+
+    public static List<PgAssetPlanDto> ConvertToPgAssetDtoList(List<PgAssetPlan> pgAssetPlanList){
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
+
+        for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+            pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+        }
+
+        return pgAssetPlanDtoList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
new file mode 100644
index 0000000..bc12db1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
@@ -0,0 +1,24 @@
+package com.casic.PgInterface.maintenance.dto;
+
+public class PgAssetPlanStatic {
+
+    private String num;
+    private String createDate;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
deleted file mode 100644
index c41ca7d..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.casic.PgInterface.maintenance.manager;
-
-import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
-
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
-        try {
-            String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
-                    "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
-                    "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-
-            if(patrolMan!=null)
-                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
-            if(startTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
-            if(endTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')<to_date('"+endTime+"','yyyy-MM-dd')";
-
-            sql+=" order by id";
-
-            List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
-
-            List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList=new ArrayList<>();
-            for(Object[] objects1:objects){
-                PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord();
-
-                pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString()));
-                pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1]));
-                pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2]));
-                pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3]));
-                pgAssetInSpectionRecord.setState(String.valueOf(objects1[4]));
-                pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5]));
-                pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6]));
-                pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7]));
-                pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8]));
-                pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9]));
-                pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10]));
-                pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11]));
-                pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12]));
-                pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13]));
-                pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14]));
-                pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15]));
-                pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16]));
-                pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17]));
-                pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18]));
-                pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19]));
-
-                pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord);
-            }
-
-            List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-            for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList)
-            {
-                pgAssetInSpectionRecordDtoList.add(PgAssetInSpectionRecordDto.ConvertToDto(pgAssetInSpectionRecord));
-            }
-
-            return pgAssetInSpectionRecordDtoList;
-        }
-        catch(Exception e)
-        {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public List<PgAssetInSpectionRecordStatic> getPgAssetInSpectionRecordStaticLisByTime(
-            String startTime, String endTime, String staticType) {
-
-        String sql="";
-        String dateType="";
-        List<PgAssetInSpectionRecordStatic> pgAssetInSpectionRecordStaticList=new ArrayList<>();
-        int type=Integer.valueOf(staticType);
-
-        switch(type) {
-            case 0://年
-                dateType = "yyyy";
-                break;
-            case 1://月
-                dateType = "yyyy-mm";
-                break;
-            case 2://周
-                dateType = "iw";
-                break;
-            case 3://日
-                dateType="yyyy-mm-dd";
-                break;
-            default:
-                break;
-        }
-
-        sql="select count(*), to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_RECORD t where 1=1";
-
-        if(startTime!=null)
-            sql+=" and t.CREATE_DATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
-        if(endTime!=null)
-            sql+=" and t.CREATE_DATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
-
-        sql+=" group by to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"')";
-
-        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
-        for(int i=0;i<objects.size();i++)
-        {
-            PgAssetInSpectionRecordStatic pgAssetInSpectionRecordStatic=new PgAssetInSpectionRecordStatic();
-            pgAssetInSpectionRecordStatic.setNum(objects.get(i)[0].toString());
-            pgAssetInSpectionRecordStatic.setCreateDate(objects.get(i)[1].toString());
-            pgAssetInSpectionRecordStaticList.add(pgAssetInSpectionRecordStatic);
-        }
-        return pgAssetInSpectionRecordStaticList;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
new file mode 100644
index 0000000..bb6bf1e
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
@@ -0,0 +1,81 @@
+package com.casic.PgInterface.maintenance.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgAssetPlanManager extends HibernateEntityDao<PgAssetPlan> {
+
+    public List<PgAssetPlanDto> getPgAssetPlanDtoList(String inSpectionPlace){
+        Criteria criteria=createCriteria(PgAssetPlan.class);
+
+        if(StringUtils.isNotBlank(inSpectionPlace))
+            criteria.add(Restrictions.like("INSPECTION_PRACE","%"+inSpectionPlace+"%"));
+        criteria.addOrder(Order.desc("id"));
+
+        List<PgAssetPlan> pgAssetPlanList=criteria.list();
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=PgAssetPlanDto.ConvertToPgAssetDtoList(pgAssetPlanList);
+
+        if(pgAssetPlanDtoList==null||pgAssetPlanDtoList.size()==0)
+            return null;
+        else
+            return pgAssetPlanDtoList;
+    }
+
+    public List<PgAssetPlanStatic> getPgAssetPlanStaticLisByTime(
+            String startTime, String endTime, String staticType) {
+
+        String sql="";
+        String dateType="";
+        List<PgAssetPlanStatic> pgAssetPlanStaticList=new ArrayList<>();
+        int type=Integer.valueOf(staticType);
+
+        switch(type) {
+            case 0://年
+                dateType = "yyyy";
+                break;
+            case 1://月
+                dateType = "yyyy-mm";
+                break;
+            case 2://周
+                dateType = "iw";
+                break;
+            case 3://日
+                dateType="yyyy-mm-dd";
+                break;
+            default:
+                break;
+        }
+
+        sql="select count(*), to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_PLAN t where 1=1";
+
+        if(startTime!=null)
+            sql+=" and t.CREATEDATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
+        if(endTime!=null)
+            sql+=" and t.CREATEDATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
+
+        sql+=" group by to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"')";
+
+        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
+        for(int i=0;i<objects.size();i++)
+        {
+            PgAssetPlanStatic pgAssetPlanStatic=new PgAssetPlanStatic();
+            pgAssetPlanStatic.setNum(objects.get(i)[0].toString());
+            pgAssetPlanStatic.setCreateDate(objects.get(i)[1].toString());
+            pgAssetPlanStaticList.add(pgAssetPlanStatic);
+        }
+        return pgAssetPlanStaticList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 0903f22..3484739 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -15,7 +15,7 @@
 
     public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
             if(repairMan!=null)
                 sql+=" and REPAIRMAN like '%"+repairMan+"%'";
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index 9cc2881..6d90d7b 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -1,5 +1,7 @@
 package com.casic.PgInterface.patroler.dto;
 
+import com.casic.PgInterface.devTable.domain.PgDevice;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 
 /**
@@ -14,6 +16,7 @@
     private String unit;//单位
     private String alarmType;//报警类型
     private Long pgDeviceId;//设备编号
+    private String assetCode;//资产编号
 
     public Long getId() {
         return id;
@@ -71,7 +74,15 @@
         this.pgDeviceId = pgDeviceId;
     }
 
-    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
+    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule, PgDeviceManager pgDeviceManager) {
         this.setId(pgAlarmRule.getId());
         this.setHighValue(pgAlarmRule.getHighValue());
         this.setLowValue(pgAlarmRule.getLowValue());
@@ -82,6 +93,10 @@
         else
             this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
         this.setPgDeviceId(pgAlarmRule.getPgDeviceId());
+        if(pgAlarmRule.getAlarmTypeId()!=null&&pgDeviceManager.get(pgAlarmRule.getPgDeviceId())!=null)
+            this.setAssetCode(pgDeviceManager.get(pgAlarmRule.getPgDeviceId()).getAssetCode());
+        else
+            this.setAssetCode("");
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
index c132c98..a7cef5b 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
@@ -1,13 +1,17 @@
 package com.casic.PgInterface.patroler.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.ResponseStatus;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -17,30 +21,23 @@
 @Service
 public class PgAlarmRuleManager extends HibernateEntityDao<PgAlarmRule> {
 
+    @Resource
+    private PgDeviceManager pgDeviceManager;
+
     //根据设备获取设备报警阈值
-    public List<PgAlarmRuleDto>  getAlarmRuleDto() {
+    public List<PgAlarmRuleDto>  getAlarmRuleDto(String devType) {
         Criteria criteria=createCriteria(PgAlarmRule.class);
+
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.eq("devType", devType));
         criteria.addOrder(Order.desc("id"));
 
         List<PgAlarmRule> pgAlarmRuleList=criteria.list();
-        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
+        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         for (PgAlarmRule pgAlarmRule : pgAlarmRuleList) {
-            pgAlarmRuleDtoList.add(new PgAlarmRuleDto(pgAlarmRule));
+            pgAlarmRuleDtoList.add(new PgAlarmRuleDto(pgAlarmRule,pgDeviceManager));
         }
         return pgAlarmRuleDtoList;
-
     }
 
-    public PgAlarmRule getAlarmRuleBydevType(String devType) {
-        Criteria criteria=createCriteria(PgAlarmRule.class);
-        criteria.add(Restrictions.eq("devType", devType));
-
-        List<PgAlarmRule> pgAlarmRuleList=criteria.list();
-
-        if(pgAlarmRuleList==null||pgAlarmRuleList.size()==0)
-            return null;
-        else
-            return pgAlarmRuleList.get(0);
-    }
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index d0e28f5..082ba5d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgAlarm;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
@@ -39,7 +40,7 @@
     private PgReservePlanManager pgReservePlanManager;
 
     /*
-    * 获取报警设备信息
+     * 获取报警设备信息
      */
     @POST
     @Path("linkDevice")
@@ -50,11 +51,22 @@
 
         PgDeviceDto pgDeviceDto = null;
         try {
-            PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
-            PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
-
-            pgDeviceDto=new PgDeviceDto(pgDevice);
-            msg = "报警关联设备获取成功";
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if (pgAlarm == null)
+                    msg = "不存在报警信息";
+                else {
+                    PgDevice pgDevice = pgAlarm.getAlarmDevId();
+                    if (pgDevice == null)
+                        msg = "不存在报警设备";
+                    else {
+                        pgDeviceDto = new PgDeviceDto(pgDevice);
+                        msg = "报警关联设备获取成功";
+                    }
+                }
+            }
+            else
+                msg="未接受到报警设备ID信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取关联设备失败";
@@ -77,11 +89,28 @@
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
-            PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
-            PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
-            pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if(pgAlarm==null)
+                    msg="不存在报警信息";
+                else {
+                    PgDevice pgDevice = pgAlarm.getAlarmDevId();
+                    if (pgDevice == null)
+                        msg = "不存在报警设备";
+                    else {
+                        String strPosition=pgDevice.getPosition();
+                        String position="";
+                        if(!strPosition.equals(""))
+                            position=pgDevice.getPosition().substring(0,3);
+                        String partition=pgDevice.getPartition();
 
-            msg = "关联设备获取成功";
+                        pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
+                        msg = "关联设备获取成功";
+                    }
+                }
+            }
+            else
+                msg="请输入报警设备Id信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "分区设备关联失败";
@@ -93,7 +122,7 @@
 
     /*
      * 根据报警记录获取关联的预案
-    */
+     */
     @POST
     @Path("linkReservePlan")
     @Produces(MediaType.APPLICATION_JSON)
@@ -103,10 +132,21 @@
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
-            PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
-            pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if (pgAlarm == null)
+                    msg = "不存在报警信息";
+                else {
+                    pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-            msg="关联预案获取成功";
+                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
+                        msg="不存在关联的报警预案";
+                    else
+                        msg = "关联预案获取成功";
+                }
+            }
+            else
+                msg="请输入报警信息";
         }
         catch(Exception e)
         {
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index d18ebb8..baacd93 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -48,14 +48,16 @@
     @POST
     @Path("getAlarmInfo")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmList(@FormParam("startDay") String startDay,
-                                            @FormParam("endDay") String endDay) throws Exception {
+    public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
+                                            @FormParam("startDay") String startDay,
+                                            @FormParam("endDay") String endDay,
+                                            @FormParam("isNew") String isNew) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(startDay,endDay);
-            if (pgAlarmDtoList.size() == 0)
+            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew);
+            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
                 msg = "没有报警信息";
             else
                 msg = "报警信息获取成功";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 87afd54..29ce8a4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -1,7 +1,5 @@
 package com.casic.PgInterface.rs;
 
-import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager;
-import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import com.casic.PgInterface.patroler.manager.PgAlarmRuleManager;
@@ -30,119 +28,23 @@
     private static Logger logger = LoggerFactory.getLogger(PgAlarmRule.class);
 
     @Resource
-    private PgDeviceManager pgDeviceManager;
-    @Resource
-    private PgAlarmTypeManager pgAlarmTypeManager;
-    @Resource
     private PgAlarmRuleManager pgAlarmRuleManager;
 
-
-
-    /**
-     * 新增报警阈值
-     */
-    @POST
-    @Path("addAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> addAlarmRule(@FormParam("highValue") String highValue,
-                                            @FormParam("lowValue") String lowValue,
-                                            @FormParam("unit") String unit,
-                                            @FormParam("devType") String devType,
-                                            @FormParam("alarmType") String alarmType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType);
-            if (pgAlarmRule != null) {
-                result = "false";
-                msg = "设备阈值已经存在";
-            } else {
-                pgAlarmRule = new PgAlarmRule();
-                pgAlarmRule.setHighValue(highValue);
-                pgAlarmRule.setLowValue(lowValue);
-                pgAlarmRule.setDevType(devType);
-                pgAlarmRule.setUnit(unit);
-                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
-
-                pgAlarmRuleManager.save(pgAlarmRule);
-                result = "true";
-                msg = "报警阈值新增成功";
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = "false";
-            msg = "报警阈值新增失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-        return resultMap;
-    }
-
-    /**
-     * 编辑报警阈值
-     */
-    @POST
-    @Path("editAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> editAlarmRule(@FormParam("id") String id,
-                                             @FormParam("devType") String devType,
-                                             @FormParam("highValue") String highValue,
-                                             @FormParam("lowValue") String lowValue,
-                                             @FormParam("unit") String unit,
-                                             @FormParam("alarmType") String alarmType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
-            if (pgAlarmRule == null) {
-                msg = "不存在报警阈值记录";
-                result = "false";
-            } else {
-                pgAlarmRule.setDevType(devType);
-                pgAlarmRule.setHighValue(highValue);
-                pgAlarmRule.setLowValue(lowValue);
-                pgAlarmRule.setUnit(unit);
-                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
-
-                pgAlarmRuleManager.save(pgAlarmRule);
-                msg = "编辑成功";
-                result = "true";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            result = "false";
-            msg = "报警阈值编辑失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-
-        return resultMap;
-    }
-
     /**
      * 获取报警阈值信息
      */
     @POST
     @Path("getAlarmRule")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmRule() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+    public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
+        System.out.println("devType:"+devType);
+        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
-            pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto();
-            if (pgAlarmRuleDtoList == null)
+            pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
+            if (pgAlarmRuleDtoList == null||pgAlarmRuleDtoList.size()==0)
                 msg = "不存在报警阈值信息";
             else
                 msg = "报警阈值获取成功";
@@ -155,69 +57,4 @@
         return resultMap;
     }
 
-    /**
-     * 删除报警阈值
-     */
-    @POST
-    @Path("deleteAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> deleteAlarmRule(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
-            if (pgAlarmRule == null) {
-                msg = "不存在报警阈值记录";
-                result = "false";
-            } else {
-                pgAlarmRuleManager.remove(pgAlarmRule);
-                msg = "删除成功";
-                result = "true";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            result = "false";
-            msg = "报警阈值删除失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-
-        return resultMap;
-    }
-
-    /**
-     * 根据设备类型报警阈值
-     */
-    @POST
-    @Path("getAlarmRuleByDevType")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmRuleByDevType(@FormParam("devType") String devType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        PgAlarmRule pgAlarmRule = null;
-        List<PgAlarmRuleDto> pgAlarmRuleDtos = new ArrayList<>();
-        try {
-            pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType);
-            if (pgAlarmRule == null)
-                msg = "不存在报警阈值记录";
-            else {
-                PgAlarmRuleDto pgAlarmRuleDto= new PgAlarmRuleDto(pgAlarmRule);
-                pgAlarmRuleDtos.add(pgAlarmRuleDto);
-                msg = "报警阈值获取成功";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            msg = "报警阈值获取失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmRuleDtos);
-
-        return resultMap;
-    }
-
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
new file mode 100644
index 0000000..19d3b8c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanRs")
+public class PgAssetPlanRs {
+
+    @Resource
+    private PgAssetPlanManager pgAssetPlanManager;
+
+    /**
+     * 获取巡检记录
+     */
+    @POST
+    @Path("getPgAssetPlanList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPgAssetPlanList(@FormParam("inSpectionPlace") String inSpectionPlace){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
+        try{
+            pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(inSpectionPlace);
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
+                msg="巡检信息获取成功";
+            else
+                msg="不存在巡检信息";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="巡检信息获取失败";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAssetPlanDtoList);
+
+        return resultMap;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
new file mode 100644
index 0000000..47ef9d1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanStaticRs")
+public class PgAssetPlanStaticRs {
+
+    @Resource
+    private PgAssetPlanManager pgAssetPlanManager;
+
+    @POST
+    @Path("getPgAssetPlanStaticList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPgAssetPlanStaticList(@FormParam("startTime") String startTime,
+                                                       @FormParam("endTime") String endTime,
+                                                       @FormParam("staticType") String staticType) throws Exception{
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
+        try{
+            pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
+                msg="巡检统计信息获取成功";
+            else
+                msg="统计信息获取失败";
+        }
+        catch (Exception ex){
+            ex.printStackTrace();
+            msg="统计失败";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAssetPlanStaticList);
+
+        return resultMap;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
deleted file mode 100644
index 66f4d09..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.manager.PgAssetInSpectionRecordManager;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@Path("pgAssetRecordRs")
-public class PgAssetRecordRs {
-
-    @Resource
-    private PgAssetInSpectionRecordManager pgAssetInSpectionRecordManager;
-
-    /**
-     * 获取巡检记录
-     */
-    @POST
-    @Path("getPgAssetRecordList")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgAssetRecordList(@FormParam("patrolMan") String patrolMan,
-                                                   @FormParam("startTime") String startTime,
-                                                   @FormParam("endTime") String endTime){
-        Map<String,Object> resultMap=new HashMap<>();
-        String msg="";
-
-        List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-        try{
-            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(patrolMan,startTime,endTime);
-            if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0)
-                msg="巡检信息获取成功";
-            else
-                msg="不存在巡检信息";
-        }
-        catch(Exception ex){
-            ex.printStackTrace();
-            msg="巡检信息获取失败";
-        }
-
-        resultMap.put("msg",msg);
-        resultMap.put("result",pgAssetInSpectionRecordDtoList);
-
-        return resultMap;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java
deleted file mode 100644
index 5f0417a..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import com.casic.PgInterface.maintenance.manager.PgAssetInSpectionRecordManager;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@Path("pgAssetRecordStaticRs")
-public class PgAssetRecordStaticRs {
-
-    @Resource
-    private PgAssetInSpectionRecordManager pgAssetInSpectionRecordManager;
-
-    @POST
-    @Path("getPgAssetRecordHeadStaticList")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgAssetRecordHeadStaticList(@FormParam("startTime") String startTime,
-                                                                @FormParam("endTime") String endTime,
-                                                                @FormParam("staticType") String staticType) throws Exception{
-        Map<String,Object> resultMap=new HashMap<>();
-        String msg="";
-        String result="";
-
-        List<PgAssetInSpectionRecordStatic> pgAssetInSpectionRecordStaticList = null;
-        try{
-            pgAssetInSpectionRecordStaticList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetInSpectionRecordStaticList!=null&&pgAssetInSpectionRecordStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
-            else
-                msg="统计信息获取失败";
-        }
-        catch (Exception ex){
-            ex.printStackTrace();
-            msg="统计失败";
-        }
-
-        resultMap.put("msg",msg);
-        resultMap.put("result",pgAssetInSpectionRecordStaticList);
-
-        return resultMap;
-    }
-
-
-}
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ff69e2a..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,27 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190828.docx" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -32,72 +42,119 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="2" />
-          <entry key="java" value="243" />
-          <entry key="properties" value="6" />
+          <entry key="java" value="321" />
+          <entry key="properties" value="8" />
           <entry key="xml" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
-          <entry key="JAVA" value="243" />
-          <entry key="Properties" value="6" />
+          <entry key="JAVA" value="321" />
+          <entry key="Properties" value="8" />
           <entry key="XML" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="8082" />
-          <entry key="properties" value="49" />
-          <entry key="txt" value="64" />
+          <entry key="dummy" value="16" />
+          <entry key="java" value="10723" />
+          <entry key="properties" value="59" />
+          <entry key="txt" value="118" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="8082" />
-          <entry key="PLAIN_TEXT" value="64" />
-          <entry key="Properties" value="49" />
+          <entry key="JAVA" value="10723" />
+          <entry key="PLAIN_TEXT" value="134" />
+          <entry key="Properties" value="59" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="4" />
+          <entry key="project.closed" value="28" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
           <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.24" value="1" />
+          <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="1" />
-          <entry key="project.open.time.3" value="3" />
-          <entry key="project.open.time.31" value="1" />
+          <entry key="project.open.time.28" value="1" />
+          <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.31" value="2" />
           <entry key="project.open.time.37" value="1" />
+          <entry key="project.open.time.39" value="2" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.40" value="1" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="1" />
+          <entry key="project.open.time.44" value="2" />
           <entry key="project.open.time.45" value="2" />
           <entry key="project.open.time.48" value="1" />
           <entry key="project.open.time.49" value="1" />
+          <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.58" value="1" />
           <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.71" value="1" />
+          <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.71" value="2" />
           <entry key="project.open.time.76" value="1" />
-          <entry key="project.opened" value="25" />
+          <entry key="project.opened" value="41" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+            <state relative-caret-position="174">
+              <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
               <folding>
-                <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-                <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="352">
+              <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#787#788#0" expanded="true" />
+                <element signature="e#817#818#0" expanded="true" />
+                <element signature="e#2105#2106#0" expanded="true" />
+                <element signature="e#2135#2136#0" expanded="true" />
+                <element signature="e#2431#2432#0" expanded="true" />
+                <element signature="e#2461#2462#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="638">
+              <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+              <folding>
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -122,6 +179,7 @@
       <find>getPgDeviceByDevType</find>
       <find>message</find>
       <find>getConstructionByType</find>
+      <find>getPgCameraListByPosition</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -130,24 +188,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanTypeDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
@@ -162,17 +207,38 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
       </list>
     </option>
   </component>
@@ -208,16 +274,18 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="3" />
-    <option name="y" value="10" />
-    <option name="width" value="1386" />
-    <option name="height" value="788" />
+    <option name="x" value="1410" />
+    <option name="y" value="117" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -258,7 +326,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -267,16 +335,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -286,7 +345,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="dto" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -296,7 +355,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="manager" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -308,19 +367,10 @@
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="webapp" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -359,6 +409,7 @@
       </deployment>
       <server-settings>
         <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_7" />
+        <option name="JNDI_PORT" value="10991" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -456,7 +507,23 @@
       <workItem from="1566350810712" duration="6803000" />
       <workItem from="1566435787074" duration="10717000" />
       <workItem from="1566521753529" duration="14265000" />
-      <workItem from="1566614176989" duration="5693000" />
+      <workItem from="1566614176989" duration="14059000" />
+      <workItem from="1566780822009" duration="1026000" />
+      <workItem from="1566891563975" duration="284000" />
+      <workItem from="1566893107340" duration="3382000" />
+      <workItem from="1566953794976" duration="11039000" />
+      <workItem from="1567059357700" duration="484000" />
+      <workItem from="1567082835097" duration="1086000" />
+      <workItem from="1567126428020" duration="1539000" />
+      <workItem from="1567129277820" duration="5788000" />
+      <workItem from="1567136008996" duration="2568000" />
+      <workItem from="1567237040302" duration="111000" />
+      <workItem from="1567495626345" duration="2797000" />
+      <workItem from="1567558770152" duration="2352000" />
+      <workItem from="1567577368149" duration="640000" />
+      <workItem from="1567751224608" duration="780000" />
+      <workItem from="1568019299799" duration="695000" />
+      <workItem from="1568082566133" duration="4016000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -493,17 +560,60 @@
       <option name="project" value="LOCAL" />
       <updated>1566553388171</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="整理管线部分">
+      <created>1566620046627</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1566620046627</updated>
+    </task>
+    <task id="LOCAL-00007" summary="合并代码提交">
+      <created>1566781001910</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1566781001910</updated>
+    </task>
+    <task id="LOCAL-00008" summary="合并代码提交">
+      <created>1566963831930</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1566963831930</updated>
+    </task>
+    <task id="LOCAL-00009" summary="修改报警阈值">
+      <created>1566972146710</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1566972146710</updated>
+    </task>
+    <task id="LOCAL-00010" summary="修改巡检维护表字段">
+      <created>1567126525554</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1567126525554</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="142930000" />
+    <option name="totallyTimeSpent" value="189883000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
+    <frame x="1358" y="-8" width="1456" height="916" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29297996" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -511,13 +621,14 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Thumbnails" weight="0.3295082" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.5081967" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.3849105" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
       <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
       <window_info anchor="bottom" id="Spring" order="8" />
       <window_info anchor="bottom" id="Terminal" order="9" />
@@ -539,7 +650,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2193646" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -547,22 +658,23 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.47540984" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
-      <window_info anchor="bottom" id="Spring" order="8" />
-      <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
-      <window_info anchor="bottom" id="Statistic" order="11" />
-      <window_info anchor="bottom" id="Java Enterprise" order="12" />
-      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="14" weight="0.32786885" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.52307695" />
+      <window_info anchor="bottom" id="Thumbnails" order="0" weight="0.3295082" />
+      <window_info anchor="bottom" id="Message" order="1" />
+      <window_info anchor="bottom" id="Find" order="2" />
+      <window_info anchor="bottom" id="Run" order="3" />
+      <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.49924356" weight="0.49344262" />
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Application Servers" order="8" weight="0.3276923" />
+      <window_info anchor="bottom" id="Spring" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
+      <window_info anchor="bottom" id="Statistic" order="12" />
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <window_info anchor="bottom" id="Database Changes" order="14" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="15" weight="0.32786885" />
+      <window_info anchor="bottom" id="Messages" order="16" weight="0.5229508" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -578,6 +690,16 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -587,7 +709,11 @@
     <MESSAGE value="修改权限问题" />
     <MESSAGE value="修改人员登录返回接口" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整理管线部分" />
+    <MESSAGE value="合并代码提交" />
+    <MESSAGE value="修改报警阈值" />
+    <MESSAGE value="修改巡检维护表字段" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护表字段" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -602,322 +728,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-532">
-          <caret line="50" column="28" lean-forward="true" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="19" column="60" selection-start-line="19" selection-start-column="60" selection-end-line="19" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="100" column="34" lean-forward="true" selection-start-line="100" selection-start-column="34" selection-end-line="100" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1474">
-          <caret line="84" column="58" selection-start-line="84" selection-start-column="58" selection-end-line="84" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1100">
-          <caret line="58" column="18" selection-start-line="58" selection-start-column="18" selection-end-line="58" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6842">
-          <caret line="329" selection-start-line="329" selection-end-line="329" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="102" column="24" lean-forward="true" selection-start-line="102" selection-start-column="24" selection-end-line="102" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="72" column="56" lean-forward="true" selection-start-line="72" selection-start-column="56" selection-end-line="72" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="90" column="39" lean-forward="true" selection-start-line="90" selection-start-column="39" selection-end-line="90" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="97" column="16" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
-          <caret line="14" column="52" lean-forward="true" selection-start-line="14" selection-start-column="52" selection-end-line="14" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="26" column="34" lean-forward="true" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="61" column="1" lean-forward="true" selection-start-line="61" selection-start-column="1" selection-end-line="61" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="208" column="49" lean-forward="true" selection-start-line="208" selection-start-column="49" selection-end-line="208" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="140" column="57" selection-start-line="140" selection-start-column="57" selection-end-line="140" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="111" column="36" selection-start-line="111" selection-start-column="36" selection-end-line="111" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="3" lean-forward="true" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="81" column="58" lean-forward="true" selection-start-line="81" selection-start-column="58" selection-end-line="81" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="472">
-          <caret line="118" column="59" selection-start-line="118" selection-start-column="59" selection-end-line="118" selection-end-column="59" />
-          <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-198">
-          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="69" column="32" lean-forward="true" selection-start-line="69" selection-start-column="32" selection-end-line="70" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="142" column="59" lean-forward="true" selection-start-line="142" selection-start-column="59" selection-end-line="142" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="349" column="9" lean-forward="true" selection-start-line="349" selection-start-column="9" selection-end-line="349" selection-end-column="9" />
-          <folding>
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="e#12105#12121#0" expanded="true" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-686">
-          <caret line="67" column="31" lean-forward="true" selection-start-line="67" selection-start-column="31" selection-end-line="67" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="93" column="24" lean-forward="true" selection-start-line="93" selection-start-column="24" selection-end-line="93" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="57" column="23" lean-forward="true" selection-start-line="57" selection-start-column="23" selection-end-line="57" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-408">
-          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="98" column="40" lean-forward="true" selection-start-line="98" selection-start-column="40" selection-end-line="98" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="572">
@@ -925,13 +735,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="328" column="32" lean-forward="true" selection-start-line="328" selection-start-column="32" selection-end-line="328" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
@@ -950,16 +753,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="396">
           <caret line="23" column="32" lean-forward="true" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
-          <folding>
-            <element signature="e#2635#2636#0" expanded="true" />
-            <element signature="e#2671#2672#0" expanded="true" />
-            <element signature="e#2727#2728#0" expanded="true" />
-            <element signature="e#2777#2778#0" expanded="true" />
-            <element signature="e#2877#2878#0" expanded="true" />
-            <element signature="e#2911#2912#0" expanded="true" />
-            <element signature="e#2963#2964#0" expanded="true" />
-            <element signature="e#3009#3010#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -972,14 +765,481 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+        <state relative-caret-position="66">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="59" column="46" lean-forward="true" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3586">
+          <caret line="179" column="16" selection-start-line="179" selection-start-column="16" selection-end-line="179" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5478">
+          <caret line="273" column="3" selection-start-line="273" selection-start-column="3" selection-end-line="273" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1870">
+          <caret line="147" column="11" selection-start-line="147" selection-start-column="11" selection-end-line="147" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="55" column="15" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="106">
+          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="290" column="41" lean-forward="true" selection-start-line="290" selection-start-column="41" selection-end-line="290" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="21" column="32" lean-forward="true" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="550">
+          <caret line="38" column="89" selection-start-line="38" selection-start-column="89" selection-end-line="38" selection-end-column="89" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="11" column="28" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1166">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="818">
+          <caret line="285" column="13" lean-forward="true" selection-start-line="285" selection-start-column="13" selection-end-line="285" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="129" column="31" lean-forward="true" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="323" column="72" lean-forward="true" selection-start-line="323" selection-start-column="72" selection-end-line="323" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="44" column="13" lean-forward="true" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-638">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="244">
+          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="157">
+          <caret line="16" column="55" lean-forward="true" selection-start-line="16" selection-start-column="55" selection-end-line="16" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="270" column="33" lean-forward="true" selection-start-line="270" selection-start-column="33" selection-end-line="270" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="490">
+          <caret line="141" selection-start-line="141" selection-end-line="141" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="164" column="5" lean-forward="true" selection-start-line="164" selection-start-column="5" selection-end-line="164" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/apiTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-242">
+          <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="61" column="16" lean-forward="true" selection-start-line="61" selection-start-column="16" selection-end-line="61" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="700">
+          <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="12" column="34" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="39" column="9" lean-forward="true" selection-start-line="39" selection-start-column="9" selection-end-line="39" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="32" column="29" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="29" />
           <folding>
-            <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-            <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#1838#1839#0" expanded="true" />
+            <element signature="e#1863#1864#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1925#1926#0" expanded="true" />
+            <element signature="e#1822#1823#0" expanded="true" />
+            <element signature="e#1851#1852#0" expanded="true" />
+            <element signature="e#1895#1896#0" expanded="true" />
+            <element signature="e#1931#1932#0" expanded="true" />
+            <element signature="e#2132#2133#0" expanded="true" />
+            <element signature="e#2164#2165#0" expanded="true" />
+            <element signature="e#2214#2215#0" expanded="true" />
+            <element signature="e#2256#2257#0" expanded="true" />
+            <element signature="e#2330#2331#0" expanded="true" />
+            <element signature="e#2370#2371#0" expanded="true" />
+            <element signature="e#2436#2437#0" expanded="true" />
+            <element signature="e#2494#2495#0" expanded="true" />
+            <element signature="e#2569#2570#0" expanded="true" />
+            <element signature="e#2602#2603#0" expanded="true" />
+            <element signature="e#2654#2655#0" expanded="true" />
+            <element signature="e#2698#2699#0" expanded="true" />
+            <element signature="e#2764#2765#0" expanded="true" />
+            <element signature="e#2795#2796#0" expanded="true" />
+            <element signature="e#2843#2844#0" expanded="true" />
+            <element signature="e#2883#2884#0" expanded="true" />
+            <element signature="e#2948#2949#0" expanded="true" />
+            <element signature="e#2980#2981#0" expanded="true" />
+            <element signature="e#3030#3031#0" expanded="true" />
+            <element signature="e#3072#3073#0" expanded="true" />
+            <element signature="e#3134#3135#0" expanded="true" />
+            <element signature="e#3162#3163#0" expanded="true" />
+            <element signature="e#3204#3205#0" expanded="true" />
+            <element signature="e#3238#3239#0" expanded="true" />
+            <element signature="e#3307#3308#0" expanded="true" />
+            <element signature="e#3346#3347#0" expanded="true" />
+            <element signature="e#3410#3411#0" expanded="true" />
+            <element signature="e#3466#3467#0" expanded="true" />
+            <element signature="e#3537#3538#0" expanded="true" />
+            <element signature="e#3567#3568#0" expanded="true" />
+            <element signature="e#3613#3614#0" expanded="true" />
+            <element signature="e#3651#3652#0" expanded="true" />
+            <element signature="e#3721#3722#0" expanded="true" />
+            <element signature="e#3759#3760#0" expanded="true" />
+            <element signature="e#3821#3822#0" expanded="true" />
+            <element signature="e#3875#3876#0" expanded="true" />
+            <element signature="e#3953#3954#0" expanded="true" />
+            <element signature="e#3991#3992#0" expanded="true" />
+            <element signature="e#4053#4054#0" expanded="true" />
+            <element signature="e#4107#4108#0" expanded="true" />
+            <element signature="e#4186#4187#0" expanded="true" />
+            <element signature="e#4225#4226#0" expanded="true" />
+            <element signature="e#4289#4290#0" expanded="true" />
+            <element signature="e#4345#4346#0" expanded="true" />
+            <element signature="e#4430#4431#0" expanded="true" />
+            <element signature="e#4474#4475#0" expanded="true" />
+            <element signature="e#4698#4699#0" expanded="true" />
+            <element signature="e#4740#4741#0" expanded="true" />
+            <element signature="e#4810#4811#0" expanded="true" />
+            <element signature="e#4872#4873#0" expanded="true" />
+            <element signature="e#4955#4956#0" expanded="true" />
+            <element signature="e#4994#4995#0" expanded="true" />
+            <element signature="e#5058#5059#0" expanded="true" />
+            <element signature="e#5114#5115#0" expanded="true" />
+            <element signature="e#5194#5195#0" expanded="true" />
+            <element signature="e#5233#5234#0" expanded="true" />
+            <element signature="e#5297#5298#0" expanded="true" />
+            <element signature="e#5353#5354#0" expanded="true" />
+            <element signature="e#5428#5429#0" expanded="true" />
+            <element signature="e#5462#5463#0" expanded="true" />
+            <element signature="e#5516#5517#0" expanded="true" />
+            <element signature="e#5562#5563#0" expanded="true" />
+            <element signature="e#5634#5635#0" expanded="true" />
+            <element signature="e#5670#5671#0" expanded="true" />
+            <element signature="e#5728#5729#0" expanded="true" />
+            <element signature="e#5778#5779#0" expanded="true" />
+            <element signature="e#5852#5853#0" expanded="true" />
+            <element signature="e#5888#5889#0" expanded="true" />
+            <element signature="e#5946#5947#0" expanded="true" />
+            <element signature="e#5996#5997#0" expanded="true" />
+            <element signature="e#6067#6068#0" expanded="true" />
+            <element signature="e#6100#6101#0" expanded="true" />
+            <element signature="e#6152#6153#0" expanded="true" />
+            <element signature="e#6196#6197#0" expanded="true" />
+            <element signature="e#6261#6262#0" expanded="true" />
+            <element signature="e#6291#6292#0" expanded="true" />
+            <element signature="e#6337#6338#0" expanded="true" />
+            <element signature="e#6375#6376#0" expanded="true" />
+            <element signature="e#6437#6438#0" expanded="true" />
+            <element signature="e#6467#6468#0" expanded="true" />
+            <element signature="e#6513#6514#0" expanded="true" />
+            <element signature="e#6551#6552#0" expanded="true" />
+            <element signature="e#6613#6614#0" expanded="true" />
+            <element signature="e#6643#6644#0" expanded="true" />
+            <element signature="e#6689#6690#0" expanded="true" />
+            <element signature="e#6727#6728#0" expanded="true" />
+            <element signature="e#6796#6797#0" expanded="true" />
+            <element signature="e#6829#6830#0" expanded="true" />
+            <element signature="e#6881#6882#0" expanded="true" />
+            <element signature="e#6925#6926#0" expanded="true" />
+            <element signature="e#6995#6996#0" expanded="true" />
+            <element signature="e#7030#7031#0" expanded="true" />
+            <element signature="e#7086#7087#0" expanded="true" />
+            <element signature="e#7134#7135#0" expanded="true" />
+            <element signature="e#7202#7203#0" expanded="true" />
+            <element signature="e#7233#7234#0" expanded="true" />
+            <element signature="e#7281#7282#0" expanded="true" />
+            <element signature="e#7321#7322#0" expanded="true" />
+            <element signature="e#7390#7391#0" expanded="true" />
+            <element signature="e#7426#7427#0" expanded="true" />
+            <element signature="e#7484#7485#0" expanded="true" />
+            <element signature="e#7534#7535#0" expanded="true" />
+            <element signature="e#7602#7603#0" expanded="true" />
+            <element signature="e#7636#7637#0" expanded="true" />
+            <element signature="e#7690#7691#0" expanded="true" />
+            <element signature="e#7736#7737#0" expanded="true" />
+            <element signature="e#7806#7807#0" expanded="true" />
+            <element signature="e#7840#7841#0" expanded="true" />
+            <element signature="e#7894#7895#0" expanded="true" />
+            <element signature="e#7940#7941#0" expanded="true" />
+            <element signature="e#8006#8007#0" expanded="true" />
+            <element signature="e#8036#8037#0" expanded="true" />
+            <element signature="e#8082#8083#0" expanded="true" />
+            <element signature="e#8120#8121#0" expanded="true" />
+            <element signature="e#8189#8190#0" expanded="true" />
+            <element signature="e#8226#8227#0" expanded="true" />
+            <element signature="e#8286#8287#0" expanded="true" />
+            <element signature="e#8338#8339#0" expanded="true" />
+            <element signature="e#8417#8418#0" expanded="true" />
+            <element signature="e#8457#8458#0" expanded="true" />
+            <element signature="e#8523#8524#0" expanded="true" />
+            <element signature="e#8581#8582#0" expanded="true" />
+            <element signature="e#8655#8656#0" expanded="true" />
+            <element signature="e#8687#8688#0" expanded="true" />
+            <element signature="e#8737#8738#0" expanded="true" />
+            <element signature="e#8779#8780#0" expanded="true" />
+            <element signature="e#8846#8847#0" expanded="true" />
+            <element signature="e#8879#8880#0" expanded="true" />
+            <element signature="e#8931#8932#0" expanded="true" />
+            <element signature="e#8975#8976#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#787#788#0" expanded="true" />
+            <element signature="e#817#818#0" expanded="true" />
+            <element signature="e#2105#2106#0" expanded="true" />
+            <element signature="e#2135#2136#0" expanded="true" />
+            <element signature="e#2431#2432#0" expanded="true" />
+            <element signature="e#2461#2462#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index 854f1f1..0db633a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -165,12 +165,16 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String startDay,String endDay) {
+    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew) {
         try {
 
             Criteria criteria = createCriteria(PgAlarm.class);
             criteria.addOrder(Order.desc("id"));
 
+            if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) {
+                criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
+            }
+
             if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay))
             {
                 criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay)));
@@ -193,9 +197,11 @@
 
                 criteria.add(Restrictions.le("alarmDate",date));
             }
+            if(StringUtils.isNotBlank(isNew)&&isNew.equals("true"))
+                criteria.add(Restrictions.eq("active", 1));
 
             List<PgAlarm> pgAlarmList = criteria.list();
-            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
     }
 
     //根据设备位置(仓位)获取摄像机列表
-    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+    public List<PgDeviceDto> getPgCameraListByPosition(String partition,String position){
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.like("position",position+"%"));
-//        criteria.add(Restrictions.eq("devType","球机"));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(position))
+            criteria.add(Restrictions.like("position",position+"%"));
+
         criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
 
         List<PgDevice> pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
             dto.setDevCode(objects[5].toString());
             dto.setDevType(objects[6].toString());
             if(objects[7]!=null)
-            dto.setIp(objects[7].toString());
+                dto.setIp(objects[7].toString());
             dto.setIsOpen(objects[8].toString());
             dto.setPartition(objects[11].toString());
             dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index 8ebf74d..3c657a7 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgEquipment;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
 import com.casic.PgInterface.devTable.dto.PgEquipmentDto;
@@ -34,9 +35,12 @@
     public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
-        criteria.add(Restrictions.eq("eqName",eqName));
-        criteria.add(Restrictions.eq("eqCode",eqCode));
-        criteria.add(Restrictions.eq("eqType",eqType));
+        if(StringUtils.isNotBlank(eqName))
+            criteria.add(Restrictions.eq("eqName",eqName));
+        if(StringUtils.isNotBlank(eqCode))
+            criteria.add(Restrictions.eq("eqCode",eqCode));
+        if(StringUtils.isNotBlank(eqType))
+            criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
@@ -51,10 +55,9 @@
 
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
-        //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
         String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
-        +eqType+"' group by equipment.EQ_NAME";
+                +eqType+"' group by equipment.EQ_NAME";
 
         List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4ed68e4..e413a5c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
@@ -39,7 +40,8 @@
 
     public List<PgPipeLineDto> getPipeLineByLineType(String lineType) {
         Criteria criteria = createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineType", lineType));
+        if(StringUtils.isNotBlank(lineType))
+            criteria.add(Restrictions.eq("lineType", lineType));
 
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    private Long id;
-    private String keyId;//巡检记录单id
-    private String planId;//巡检计划ID
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    @Column(name="KEY_ID")
-    public String getKeyId() {
-        return keyId;
-    }
-
-    public void setKeyId(String keyId) {
-        this.keyId = keyId;
-    }
-
-    @Column(name="PLAN_ID")
-    public String getPlanId() {
-        return planId;
-    }
-
-    public void setPlanId(String planId) {
-        this.planId = planId;
-    }
-
-    @Column(name="CREATE_DATE")
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    @Column(name="STATE")
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    @Column(name="CREATOR")
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    @Column(name="PLAN_NAME")
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    @Column(name="RECORD_NO")
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    @Column(name="PLAN_NO")
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    @Column(name="RESPONSIBIE_DEPT")
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    @Column(name="INSPECTION_PERSON")
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    @Column(name="PATROL_MAN")
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    @Column(name="OPERATE_DATE")
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    @Column(name="REMARK")
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Column(name="BUILD_CABIN")
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    @Column(name="PROJECT")
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    @Column(name="START_PILE_NO")
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    @Column(name="END_PILE_NO")
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    @Column(name="INSPECTION_PRACE")
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    @Column(name="OTHER_PATROL_MAN")
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private Long id;
+    private String KEY_ID;//唯一键值
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_PERSON;//巡检人
+    private String START_DATE;//巡检开始时间
+    private String END_DATE;
+    private String FREQUENCY;//巡检频率
+    private String STATE;//状态
+    private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+    private String PLAN_NO;//巡检计划编号
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_MODE;//巡检方式
+    private String INSPECTION_ROUTE;//巡检路线
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String INSPECTION_GROUP;//巡检部门
+    private String INSERT_TIME;//插入时间
+    private String FREQUENCYDATE;//巡检具体日期
+    private String FREQUENCYTIME;//巡检具体时间
+    private String CREATEDATE;//创建时间
+    private String CREATOR;//创建人
+    private String PROJECT;//项目
+    private String COMLILE;//编制人
+    private String START_TIME;//编制时间
+    private String DEVELOP_DEPT;//制定部门
+    private String END_TIME;//结束时间
+    private String START_PILE_NO;//开始桩号
+    private String END_PILE_NO;//结束桩号
+    private String BUILD_CABIN;//巡检舱室
+    private String MILEAGE;
+    private String FREQUENCY_TIME;//巡检具体时间
+    private String FREQUENCYTIME_END;
+    private String KETTLE_TS;
+    private String UPDATEDATE;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="KEY_ID")
+    public String getKEY_ID() {
+        return KEY_ID;
+    }
+
+    public void setKEY_ID(String KEY_ID) {
+        this.KEY_ID = KEY_ID;
+    }
+
+    @Column(name="PLAN_NAME")
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    @Column(name="INSPECTION_PERSON")
+    public String getINSPECTION_PERSON() {
+        return INSPECTION_PERSON;
+    }
+
+    public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+        this.INSPECTION_PERSON = INSPECTION_PERSON;
+    }
+
+    @Column(name="START_DATE")
+    public String getSTART_DATE() {
+        return START_DATE;
+    }
+
+    public void setSTART_DATE(String START_DATE) {
+        this.START_DATE = START_DATE;
+    }
+
+    @Column(name="END_DATE")
+    public String getEND_DATE() {
+        return END_DATE;
+    }
+
+    public void setEND_DATE(String END_DATE) {
+        this.END_DATE = END_DATE;
+    }
+
+    @Column(name="FREQUENCY")
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    @Column(name="STATE")
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    @Column(name="RESPONSIBLE_DEPT")
+    public String getRESPONSIBLE_DEPT() {
+        return RESPONSIBLE_DEPT;
+    }
+
+    public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+        this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+    }
+
+    @Column(name="PLAN_NO")
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    @Column(name="INSPECTION_TYPE")
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    @Column(name="INSPECTION_MODE")
+    public String getINSPECTION_MODE() {
+        return INSPECTION_MODE;
+    }
+
+    public void setINSPECTION_MODE(String INSPECTION_MODE) {
+        this.INSPECTION_MODE = INSPECTION_MODE;
+    }
+
+    @Column(name="INSPECTION_ROUTE")
+    public String getINSPECTION_ROUTE() {
+        return INSPECTION_ROUTE;
+    }
+
+    public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+        this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+    }
+
+    @Column(name="INSPECTION_START_TIME")
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    @Column(name="INSPECTION_END_TIME")
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    @Column(name="INSPECTION_PRACE")
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    @Column(name="INSPECTION_GROUP")
+    public String getINSPECTION_GROUP() {
+        return INSPECTION_GROUP;
+    }
+
+    public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+        this.INSPECTION_GROUP = INSPECTION_GROUP;
+    }
+
+    @Column(name="INSERT_TIME")
+    public String getINSERT_TIME() {
+        return INSERT_TIME;
+    }
+
+    public void setINSERT_TIME(String INSERT_TIME) {
+        this.INSERT_TIME = INSERT_TIME;
+    }
+
+    @Column(name="FREQUENCYDATE")
+    public String getFREQUENCYDATE() {
+        return FREQUENCYDATE;
+    }
+
+    public void setFREQUENCYDATE(String FREQUENCYDATE) {
+        this.FREQUENCYDATE = FREQUENCYDATE;
+    }
+
+    @Column(name="FREQUENCYTIME")
+    public String getFREQUENCYTIME() {
+        return FREQUENCYTIME;
+    }
+
+    public void setFREQUENCYTIME(String FREQUENCYTIME) {
+        this.FREQUENCYTIME = FREQUENCYTIME;
+    }
+
+    @Column(name="CREATEDATE")
+    public String getCREATEDATE() {
+        return CREATEDATE;
+    }
+
+    public void setCREATEDATE(String CREATEDATE) {
+        this.CREATEDATE = CREATEDATE;
+    }
+
+    @Column(name="CREATOR")
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    @Column(name="PROJECT")
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    @Column(name="COMLILE")
+    public String getCOMLILE() {
+        return COMLILE;
+    }
+
+    public void setCOMLILE(String COMLILE) {
+        this.COMLILE = COMLILE;
+    }
+
+    @Column(name="START_TIME")
+    public String getSTART_TIME() {
+        return START_TIME;
+    }
+
+    public void setSTART_TIME(String START_TIME) {
+        this.START_TIME = START_TIME;
+    }
+
+    @Column(name="DEVELOP_DEPT")
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    @Column(name="END_TIME")
+    public String getEND_TIME() {
+        return END_TIME;
+    }
+
+    public void setEND_TIME(String END_TIME) {
+        this.END_TIME = END_TIME;
+    }
+
+    @Column(name="START_PILE_NO")
+    public String getSTART_PILE_NO() {
+        return START_PILE_NO;
+    }
+
+    public void setSTART_PILE_NO(String START_PILE_NO) {
+        this.START_PILE_NO = START_PILE_NO;
+    }
+
+    @Column(name="END_PILE_NO")
+    public String getEND_PILE_NO() {
+        return END_PILE_NO;
+    }
+
+    public void setEND_PILE_NO(String END_PILE_NO) {
+        this.END_PILE_NO = END_PILE_NO;
+    }
+
+    @Column(name="BUILD_CABIN")
+    public String getBUILD_CABIN() {
+        return BUILD_CABIN;
+    }
+
+    public void setBUILD_CABIN(String BUILD_CABIN) {
+        this.BUILD_CABIN = BUILD_CABIN;
+    }
+
+    @Column(name="MILEAGE")
+    public String getMILEAGE() {
+        return MILEAGE;
+    }
+
+    public void setMILEAGE(String MILEAGE) {
+        this.MILEAGE = MILEAGE;
+    }
+
+    @Column(name="FREQUENCY_TIME")
+    public String getFREQUENCY_TIME() {
+        return FREQUENCY_TIME;
+    }
+
+    public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+        this.FREQUENCY_TIME = FREQUENCY_TIME;
+    }
+
+    @Column(name="FREQUENCYTIME_END")
+    public String getFREQUENCYTIME_END() {
+        return FREQUENCYTIME_END;
+    }
+
+    public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+        this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+    }
+
+    @Column(name="KETTLE_TS")
+    public String getKETTLE_TS() {
+        return KETTLE_TS;
+    }
+
+    public void setKETTLE_TS(String KETTLE_TS) {
+        this.KETTLE_TS = KETTLE_TS;
+    }
+
+    @Column(name="UPDATEDATE")
+    public String getUPDATEDATE() {
+        return UPDATEDATE;
+    }
+
+    public void setUPDATEDATE(String UPDATEDATE) {
+        this.UPDATEDATE = UPDATEDATE;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 5346b57..2f8d359 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -66,7 +66,7 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REPAIRMAN")
+    @Column(name="REOAIRMAN")
     public String getRepairMan() {
         return repairMan;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
-    private Long id;
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-
-
-    public static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
-        PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
-        pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
-        pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
-        pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
-        pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
-        pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
-        pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
-        pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
-        pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
-        pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
-        pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
-        pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
-        pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
-        pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
-        pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
-        return pgAssetInSpectionRecordDto;
-    }
-
-
-    public static List<PgAssetInSpectionRecordDto> ConvertToDtoList(List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList){
-        List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-        for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
-            pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
-        }
-
-        return pgAssetInSpectionRecordDtoList;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
-    private String num;
-    private String createDate;
-
-    public String getNum() {
-        return num;
-    }
-
-    public void setNum(String num) {
-        this.num = num;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+    private Long id;
+    private String PLAN_NO;//巡检计划编号
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String FREQUENCY;//巡检频率
+    private String CREATOR;//创建人
+    private String DEVELOP_DEPT;//制定部门
+    private String PROJECT;//项目
+    private String STATE;//状态
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+        PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+        pgAssetPlanDto.setId(pgAssetPlan.getId());
+        pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+        pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+        pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+        pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+        pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+        pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+        pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+        pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+        pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+        pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+        pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+        return pgAssetPlanDto;
+    }
+
+    public static List<PgAssetPlanDto> ConvertToPgAssetDtoList(List<PgAssetPlan> pgAssetPlanList){
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
+
+        for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+            pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+        }
+
+        return pgAssetPlanDtoList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
new file mode 100644
index 0000000..bc12db1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
@@ -0,0 +1,24 @@
+package com.casic.PgInterface.maintenance.dto;
+
+public class PgAssetPlanStatic {
+
+    private String num;
+    private String createDate;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
deleted file mode 100644
index c41ca7d..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.casic.PgInterface.maintenance.manager;
-
-import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
-
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
-        try {
-            String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
-                    "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
-                    "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-
-            if(patrolMan!=null)
-                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
-            if(startTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
-            if(endTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')<to_date('"+endTime+"','yyyy-MM-dd')";
-
-            sql+=" order by id";
-
-            List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
-
-            List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList=new ArrayList<>();
-            for(Object[] objects1:objects){
-                PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord();
-
-                pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString()));
-                pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1]));
-                pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2]));
-                pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3]));
-                pgAssetInSpectionRecord.setState(String.valueOf(objects1[4]));
-                pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5]));
-                pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6]));
-                pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7]));
-                pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8]));
-                pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9]));
-                pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10]));
-                pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11]));
-                pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12]));
-                pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13]));
-                pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14]));
-                pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15]));
-                pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16]));
-                pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17]));
-                pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18]));
-                pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19]));
-
-                pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord);
-            }
-
-            List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-            for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList)
-            {
-                pgAssetInSpectionRecordDtoList.add(PgAssetInSpectionRecordDto.ConvertToDto(pgAssetInSpectionRecord));
-            }
-
-            return pgAssetInSpectionRecordDtoList;
-        }
-        catch(Exception e)
-        {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public List<PgAssetInSpectionRecordStatic> getPgAssetInSpectionRecordStaticLisByTime(
-            String startTime, String endTime, String staticType) {
-
-        String sql="";
-        String dateType="";
-        List<PgAssetInSpectionRecordStatic> pgAssetInSpectionRecordStaticList=new ArrayList<>();
-        int type=Integer.valueOf(staticType);
-
-        switch(type) {
-            case 0://年
-                dateType = "yyyy";
-                break;
-            case 1://月
-                dateType = "yyyy-mm";
-                break;
-            case 2://周
-                dateType = "iw";
-                break;
-            case 3://日
-                dateType="yyyy-mm-dd";
-                break;
-            default:
-                break;
-        }
-
-        sql="select count(*), to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_RECORD t where 1=1";
-
-        if(startTime!=null)
-            sql+=" and t.CREATE_DATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
-        if(endTime!=null)
-            sql+=" and t.CREATE_DATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
-
-        sql+=" group by to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"')";
-
-        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
-        for(int i=0;i<objects.size();i++)
-        {
-            PgAssetInSpectionRecordStatic pgAssetInSpectionRecordStatic=new PgAssetInSpectionRecordStatic();
-            pgAssetInSpectionRecordStatic.setNum(objects.get(i)[0].toString());
-            pgAssetInSpectionRecordStatic.setCreateDate(objects.get(i)[1].toString());
-            pgAssetInSpectionRecordStaticList.add(pgAssetInSpectionRecordStatic);
-        }
-        return pgAssetInSpectionRecordStaticList;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
new file mode 100644
index 0000000..bb6bf1e
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
@@ -0,0 +1,81 @@
+package com.casic.PgInterface.maintenance.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgAssetPlanManager extends HibernateEntityDao<PgAssetPlan> {
+
+    public List<PgAssetPlanDto> getPgAssetPlanDtoList(String inSpectionPlace){
+        Criteria criteria=createCriteria(PgAssetPlan.class);
+
+        if(StringUtils.isNotBlank(inSpectionPlace))
+            criteria.add(Restrictions.like("INSPECTION_PRACE","%"+inSpectionPlace+"%"));
+        criteria.addOrder(Order.desc("id"));
+
+        List<PgAssetPlan> pgAssetPlanList=criteria.list();
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=PgAssetPlanDto.ConvertToPgAssetDtoList(pgAssetPlanList);
+
+        if(pgAssetPlanDtoList==null||pgAssetPlanDtoList.size()==0)
+            return null;
+        else
+            return pgAssetPlanDtoList;
+    }
+
+    public List<PgAssetPlanStatic> getPgAssetPlanStaticLisByTime(
+            String startTime, String endTime, String staticType) {
+
+        String sql="";
+        String dateType="";
+        List<PgAssetPlanStatic> pgAssetPlanStaticList=new ArrayList<>();
+        int type=Integer.valueOf(staticType);
+
+        switch(type) {
+            case 0://年
+                dateType = "yyyy";
+                break;
+            case 1://月
+                dateType = "yyyy-mm";
+                break;
+            case 2://周
+                dateType = "iw";
+                break;
+            case 3://日
+                dateType="yyyy-mm-dd";
+                break;
+            default:
+                break;
+        }
+
+        sql="select count(*), to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_PLAN t where 1=1";
+
+        if(startTime!=null)
+            sql+=" and t.CREATEDATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
+        if(endTime!=null)
+            sql+=" and t.CREATEDATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
+
+        sql+=" group by to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"')";
+
+        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
+        for(int i=0;i<objects.size();i++)
+        {
+            PgAssetPlanStatic pgAssetPlanStatic=new PgAssetPlanStatic();
+            pgAssetPlanStatic.setNum(objects.get(i)[0].toString());
+            pgAssetPlanStatic.setCreateDate(objects.get(i)[1].toString());
+            pgAssetPlanStaticList.add(pgAssetPlanStatic);
+        }
+        return pgAssetPlanStaticList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 0903f22..3484739 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -15,7 +15,7 @@
 
     public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
             if(repairMan!=null)
                 sql+=" and REPAIRMAN like '%"+repairMan+"%'";
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index 9cc2881..6d90d7b 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -1,5 +1,7 @@
 package com.casic.PgInterface.patroler.dto;
 
+import com.casic.PgInterface.devTable.domain.PgDevice;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 
 /**
@@ -14,6 +16,7 @@
     private String unit;//单位
     private String alarmType;//报警类型
     private Long pgDeviceId;//设备编号
+    private String assetCode;//资产编号
 
     public Long getId() {
         return id;
@@ -71,7 +74,15 @@
         this.pgDeviceId = pgDeviceId;
     }
 
-    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
+    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule, PgDeviceManager pgDeviceManager) {
         this.setId(pgAlarmRule.getId());
         this.setHighValue(pgAlarmRule.getHighValue());
         this.setLowValue(pgAlarmRule.getLowValue());
@@ -82,6 +93,10 @@
         else
             this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
         this.setPgDeviceId(pgAlarmRule.getPgDeviceId());
+        if(pgAlarmRule.getAlarmTypeId()!=null&&pgDeviceManager.get(pgAlarmRule.getPgDeviceId())!=null)
+            this.setAssetCode(pgDeviceManager.get(pgAlarmRule.getPgDeviceId()).getAssetCode());
+        else
+            this.setAssetCode("");
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
index c132c98..a7cef5b 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
@@ -1,13 +1,17 @@
 package com.casic.PgInterface.patroler.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.ResponseStatus;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -17,30 +21,23 @@
 @Service
 public class PgAlarmRuleManager extends HibernateEntityDao<PgAlarmRule> {
 
+    @Resource
+    private PgDeviceManager pgDeviceManager;
+
     //根据设备获取设备报警阈值
-    public List<PgAlarmRuleDto>  getAlarmRuleDto() {
+    public List<PgAlarmRuleDto>  getAlarmRuleDto(String devType) {
         Criteria criteria=createCriteria(PgAlarmRule.class);
+
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.eq("devType", devType));
         criteria.addOrder(Order.desc("id"));
 
         List<PgAlarmRule> pgAlarmRuleList=criteria.list();
-        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
+        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         for (PgAlarmRule pgAlarmRule : pgAlarmRuleList) {
-            pgAlarmRuleDtoList.add(new PgAlarmRuleDto(pgAlarmRule));
+            pgAlarmRuleDtoList.add(new PgAlarmRuleDto(pgAlarmRule,pgDeviceManager));
         }
         return pgAlarmRuleDtoList;
-
     }
 
-    public PgAlarmRule getAlarmRuleBydevType(String devType) {
-        Criteria criteria=createCriteria(PgAlarmRule.class);
-        criteria.add(Restrictions.eq("devType", devType));
-
-        List<PgAlarmRule> pgAlarmRuleList=criteria.list();
-
-        if(pgAlarmRuleList==null||pgAlarmRuleList.size()==0)
-            return null;
-        else
-            return pgAlarmRuleList.get(0);
-    }
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index d0e28f5..082ba5d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgAlarm;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
@@ -39,7 +40,7 @@
     private PgReservePlanManager pgReservePlanManager;
 
     /*
-    * 获取报警设备信息
+     * 获取报警设备信息
      */
     @POST
     @Path("linkDevice")
@@ -50,11 +51,22 @@
 
         PgDeviceDto pgDeviceDto = null;
         try {
-            PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
-            PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
-
-            pgDeviceDto=new PgDeviceDto(pgDevice);
-            msg = "报警关联设备获取成功";
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if (pgAlarm == null)
+                    msg = "不存在报警信息";
+                else {
+                    PgDevice pgDevice = pgAlarm.getAlarmDevId();
+                    if (pgDevice == null)
+                        msg = "不存在报警设备";
+                    else {
+                        pgDeviceDto = new PgDeviceDto(pgDevice);
+                        msg = "报警关联设备获取成功";
+                    }
+                }
+            }
+            else
+                msg="未接受到报警设备ID信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取关联设备失败";
@@ -77,11 +89,28 @@
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
-            PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
-            PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
-            pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if(pgAlarm==null)
+                    msg="不存在报警信息";
+                else {
+                    PgDevice pgDevice = pgAlarm.getAlarmDevId();
+                    if (pgDevice == null)
+                        msg = "不存在报警设备";
+                    else {
+                        String strPosition=pgDevice.getPosition();
+                        String position="";
+                        if(!strPosition.equals(""))
+                            position=pgDevice.getPosition().substring(0,3);
+                        String partition=pgDevice.getPartition();
 
-            msg = "关联设备获取成功";
+                        pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
+                        msg = "关联设备获取成功";
+                    }
+                }
+            }
+            else
+                msg="请输入报警设备Id信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "分区设备关联失败";
@@ -93,7 +122,7 @@
 
     /*
      * 根据报警记录获取关联的预案
-    */
+     */
     @POST
     @Path("linkReservePlan")
     @Produces(MediaType.APPLICATION_JSON)
@@ -103,10 +132,21 @@
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
-            PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
-            pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if (pgAlarm == null)
+                    msg = "不存在报警信息";
+                else {
+                    pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-            msg="关联预案获取成功";
+                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
+                        msg="不存在关联的报警预案";
+                    else
+                        msg = "关联预案获取成功";
+                }
+            }
+            else
+                msg="请输入报警信息";
         }
         catch(Exception e)
         {
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index d18ebb8..baacd93 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -48,14 +48,16 @@
     @POST
     @Path("getAlarmInfo")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmList(@FormParam("startDay") String startDay,
-                                            @FormParam("endDay") String endDay) throws Exception {
+    public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
+                                            @FormParam("startDay") String startDay,
+                                            @FormParam("endDay") String endDay,
+                                            @FormParam("isNew") String isNew) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(startDay,endDay);
-            if (pgAlarmDtoList.size() == 0)
+            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew);
+            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
                 msg = "没有报警信息";
             else
                 msg = "报警信息获取成功";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 87afd54..29ce8a4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -1,7 +1,5 @@
 package com.casic.PgInterface.rs;
 
-import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager;
-import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import com.casic.PgInterface.patroler.manager.PgAlarmRuleManager;
@@ -30,119 +28,23 @@
     private static Logger logger = LoggerFactory.getLogger(PgAlarmRule.class);
 
     @Resource
-    private PgDeviceManager pgDeviceManager;
-    @Resource
-    private PgAlarmTypeManager pgAlarmTypeManager;
-    @Resource
     private PgAlarmRuleManager pgAlarmRuleManager;
 
-
-
-    /**
-     * 新增报警阈值
-     */
-    @POST
-    @Path("addAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> addAlarmRule(@FormParam("highValue") String highValue,
-                                            @FormParam("lowValue") String lowValue,
-                                            @FormParam("unit") String unit,
-                                            @FormParam("devType") String devType,
-                                            @FormParam("alarmType") String alarmType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType);
-            if (pgAlarmRule != null) {
-                result = "false";
-                msg = "设备阈值已经存在";
-            } else {
-                pgAlarmRule = new PgAlarmRule();
-                pgAlarmRule.setHighValue(highValue);
-                pgAlarmRule.setLowValue(lowValue);
-                pgAlarmRule.setDevType(devType);
-                pgAlarmRule.setUnit(unit);
-                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
-
-                pgAlarmRuleManager.save(pgAlarmRule);
-                result = "true";
-                msg = "报警阈值新增成功";
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = "false";
-            msg = "报警阈值新增失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-        return resultMap;
-    }
-
-    /**
-     * 编辑报警阈值
-     */
-    @POST
-    @Path("editAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> editAlarmRule(@FormParam("id") String id,
-                                             @FormParam("devType") String devType,
-                                             @FormParam("highValue") String highValue,
-                                             @FormParam("lowValue") String lowValue,
-                                             @FormParam("unit") String unit,
-                                             @FormParam("alarmType") String alarmType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
-            if (pgAlarmRule == null) {
-                msg = "不存在报警阈值记录";
-                result = "false";
-            } else {
-                pgAlarmRule.setDevType(devType);
-                pgAlarmRule.setHighValue(highValue);
-                pgAlarmRule.setLowValue(lowValue);
-                pgAlarmRule.setUnit(unit);
-                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
-
-                pgAlarmRuleManager.save(pgAlarmRule);
-                msg = "编辑成功";
-                result = "true";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            result = "false";
-            msg = "报警阈值编辑失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-
-        return resultMap;
-    }
-
     /**
      * 获取报警阈值信息
      */
     @POST
     @Path("getAlarmRule")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmRule() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+    public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
+        System.out.println("devType:"+devType);
+        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
-            pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto();
-            if (pgAlarmRuleDtoList == null)
+            pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
+            if (pgAlarmRuleDtoList == null||pgAlarmRuleDtoList.size()==0)
                 msg = "不存在报警阈值信息";
             else
                 msg = "报警阈值获取成功";
@@ -155,69 +57,4 @@
         return resultMap;
     }
 
-    /**
-     * 删除报警阈值
-     */
-    @POST
-    @Path("deleteAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> deleteAlarmRule(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
-            if (pgAlarmRule == null) {
-                msg = "不存在报警阈值记录";
-                result = "false";
-            } else {
-                pgAlarmRuleManager.remove(pgAlarmRule);
-                msg = "删除成功";
-                result = "true";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            result = "false";
-            msg = "报警阈值删除失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-
-        return resultMap;
-    }
-
-    /**
-     * 根据设备类型报警阈值
-     */
-    @POST
-    @Path("getAlarmRuleByDevType")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmRuleByDevType(@FormParam("devType") String devType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        PgAlarmRule pgAlarmRule = null;
-        List<PgAlarmRuleDto> pgAlarmRuleDtos = new ArrayList<>();
-        try {
-            pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType);
-            if (pgAlarmRule == null)
-                msg = "不存在报警阈值记录";
-            else {
-                PgAlarmRuleDto pgAlarmRuleDto= new PgAlarmRuleDto(pgAlarmRule);
-                pgAlarmRuleDtos.add(pgAlarmRuleDto);
-                msg = "报警阈值获取成功";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            msg = "报警阈值获取失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmRuleDtos);
-
-        return resultMap;
-    }
-
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
new file mode 100644
index 0000000..19d3b8c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanRs")
+public class PgAssetPlanRs {
+
+    @Resource
+    private PgAssetPlanManager pgAssetPlanManager;
+
+    /**
+     * 获取巡检记录
+     */
+    @POST
+    @Path("getPgAssetPlanList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPgAssetPlanList(@FormParam("inSpectionPlace") String inSpectionPlace){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
+        try{
+            pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(inSpectionPlace);
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
+                msg="巡检信息获取成功";
+            else
+                msg="不存在巡检信息";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="巡检信息获取失败";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAssetPlanDtoList);
+
+        return resultMap;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
new file mode 100644
index 0000000..47ef9d1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanStaticRs")
+public class PgAssetPlanStaticRs {
+
+    @Resource
+    private PgAssetPlanManager pgAssetPlanManager;
+
+    @POST
+    @Path("getPgAssetPlanStaticList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPgAssetPlanStaticList(@FormParam("startTime") String startTime,
+                                                       @FormParam("endTime") String endTime,
+                                                       @FormParam("staticType") String staticType) throws Exception{
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
+        try{
+            pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
+                msg="巡检统计信息获取成功";
+            else
+                msg="统计信息获取失败";
+        }
+        catch (Exception ex){
+            ex.printStackTrace();
+            msg="统计失败";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAssetPlanStaticList);
+
+        return resultMap;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
deleted file mode 100644
index 66f4d09..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.manager.PgAssetInSpectionRecordManager;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@Path("pgAssetRecordRs")
-public class PgAssetRecordRs {
-
-    @Resource
-    private PgAssetInSpectionRecordManager pgAssetInSpectionRecordManager;
-
-    /**
-     * 获取巡检记录
-     */
-    @POST
-    @Path("getPgAssetRecordList")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgAssetRecordList(@FormParam("patrolMan") String patrolMan,
-                                                   @FormParam("startTime") String startTime,
-                                                   @FormParam("endTime") String endTime){
-        Map<String,Object> resultMap=new HashMap<>();
-        String msg="";
-
-        List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-        try{
-            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(patrolMan,startTime,endTime);
-            if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0)
-                msg="巡检信息获取成功";
-            else
-                msg="不存在巡检信息";
-        }
-        catch(Exception ex){
-            ex.printStackTrace();
-            msg="巡检信息获取失败";
-        }
-
-        resultMap.put("msg",msg);
-        resultMap.put("result",pgAssetInSpectionRecordDtoList);
-
-        return resultMap;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java
deleted file mode 100644
index 5f0417a..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import com.casic.PgInterface.maintenance.manager.PgAssetInSpectionRecordManager;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@Path("pgAssetRecordStaticRs")
-public class PgAssetRecordStaticRs {
-
-    @Resource
-    private PgAssetInSpectionRecordManager pgAssetInSpectionRecordManager;
-
-    @POST
-    @Path("getPgAssetRecordHeadStaticList")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgAssetRecordHeadStaticList(@FormParam("startTime") String startTime,
-                                                                @FormParam("endTime") String endTime,
-                                                                @FormParam("staticType") String staticType) throws Exception{
-        Map<String,Object> resultMap=new HashMap<>();
-        String msg="";
-        String result="";
-
-        List<PgAssetInSpectionRecordStatic> pgAssetInSpectionRecordStaticList = null;
-        try{
-            pgAssetInSpectionRecordStaticList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetInSpectionRecordStaticList!=null&&pgAssetInSpectionRecordStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
-            else
-                msg="统计信息获取失败";
-        }
-        catch (Exception ex){
-            ex.printStackTrace();
-            msg="统计失败";
-        }
-
-        resultMap.put("msg",msg);
-        resultMap.put("result",pgAssetInSpectionRecordStaticList);
-
-        return resultMap;
-    }
-
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index 9dfdd88..a0245ba 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -326,7 +326,7 @@
 
             PgConstruction pgConstruction=pgConstructionManager.get(Long.valueOf(id));
 
-            pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(pgConstruction.getPgName());
+            pgDeviceDtoList=pgDeviceManager.getPgCameraListByPartition(pgConstruction.getPgName());
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ff69e2a..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,27 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190828.docx" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -32,72 +42,119 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="2" />
-          <entry key="java" value="243" />
-          <entry key="properties" value="6" />
+          <entry key="java" value="321" />
+          <entry key="properties" value="8" />
           <entry key="xml" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
-          <entry key="JAVA" value="243" />
-          <entry key="Properties" value="6" />
+          <entry key="JAVA" value="321" />
+          <entry key="Properties" value="8" />
           <entry key="XML" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="8082" />
-          <entry key="properties" value="49" />
-          <entry key="txt" value="64" />
+          <entry key="dummy" value="16" />
+          <entry key="java" value="10723" />
+          <entry key="properties" value="59" />
+          <entry key="txt" value="118" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="8082" />
-          <entry key="PLAIN_TEXT" value="64" />
-          <entry key="Properties" value="49" />
+          <entry key="JAVA" value="10723" />
+          <entry key="PLAIN_TEXT" value="134" />
+          <entry key="Properties" value="59" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="4" />
+          <entry key="project.closed" value="28" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
           <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.24" value="1" />
+          <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="1" />
-          <entry key="project.open.time.3" value="3" />
-          <entry key="project.open.time.31" value="1" />
+          <entry key="project.open.time.28" value="1" />
+          <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.31" value="2" />
           <entry key="project.open.time.37" value="1" />
+          <entry key="project.open.time.39" value="2" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.40" value="1" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="1" />
+          <entry key="project.open.time.44" value="2" />
           <entry key="project.open.time.45" value="2" />
           <entry key="project.open.time.48" value="1" />
           <entry key="project.open.time.49" value="1" />
+          <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.58" value="1" />
           <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.71" value="1" />
+          <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.71" value="2" />
           <entry key="project.open.time.76" value="1" />
-          <entry key="project.opened" value="25" />
+          <entry key="project.opened" value="41" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+            <state relative-caret-position="174">
+              <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
               <folding>
-                <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-                <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="352">
+              <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#787#788#0" expanded="true" />
+                <element signature="e#817#818#0" expanded="true" />
+                <element signature="e#2105#2106#0" expanded="true" />
+                <element signature="e#2135#2136#0" expanded="true" />
+                <element signature="e#2431#2432#0" expanded="true" />
+                <element signature="e#2461#2462#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="638">
+              <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+              <folding>
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -122,6 +179,7 @@
       <find>getPgDeviceByDevType</find>
       <find>message</find>
       <find>getConstructionByType</find>
+      <find>getPgCameraListByPosition</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -130,24 +188,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanTypeDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
@@ -162,17 +207,38 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
       </list>
     </option>
   </component>
@@ -208,16 +274,18 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="3" />
-    <option name="y" value="10" />
-    <option name="width" value="1386" />
-    <option name="height" value="788" />
+    <option name="x" value="1410" />
+    <option name="y" value="117" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -258,7 +326,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -267,16 +335,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -286,7 +345,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="dto" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -296,7 +355,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="manager" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -308,19 +367,10 @@
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="webapp" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -359,6 +409,7 @@
       </deployment>
       <server-settings>
         <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_7" />
+        <option name="JNDI_PORT" value="10991" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -456,7 +507,23 @@
       <workItem from="1566350810712" duration="6803000" />
       <workItem from="1566435787074" duration="10717000" />
       <workItem from="1566521753529" duration="14265000" />
-      <workItem from="1566614176989" duration="5693000" />
+      <workItem from="1566614176989" duration="14059000" />
+      <workItem from="1566780822009" duration="1026000" />
+      <workItem from="1566891563975" duration="284000" />
+      <workItem from="1566893107340" duration="3382000" />
+      <workItem from="1566953794976" duration="11039000" />
+      <workItem from="1567059357700" duration="484000" />
+      <workItem from="1567082835097" duration="1086000" />
+      <workItem from="1567126428020" duration="1539000" />
+      <workItem from="1567129277820" duration="5788000" />
+      <workItem from="1567136008996" duration="2568000" />
+      <workItem from="1567237040302" duration="111000" />
+      <workItem from="1567495626345" duration="2797000" />
+      <workItem from="1567558770152" duration="2352000" />
+      <workItem from="1567577368149" duration="640000" />
+      <workItem from="1567751224608" duration="780000" />
+      <workItem from="1568019299799" duration="695000" />
+      <workItem from="1568082566133" duration="4016000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -493,17 +560,60 @@
       <option name="project" value="LOCAL" />
       <updated>1566553388171</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="整理管线部分">
+      <created>1566620046627</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1566620046627</updated>
+    </task>
+    <task id="LOCAL-00007" summary="合并代码提交">
+      <created>1566781001910</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1566781001910</updated>
+    </task>
+    <task id="LOCAL-00008" summary="合并代码提交">
+      <created>1566963831930</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1566963831930</updated>
+    </task>
+    <task id="LOCAL-00009" summary="修改报警阈值">
+      <created>1566972146710</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1566972146710</updated>
+    </task>
+    <task id="LOCAL-00010" summary="修改巡检维护表字段">
+      <created>1567126525554</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1567126525554</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="142930000" />
+    <option name="totallyTimeSpent" value="189883000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
+    <frame x="1358" y="-8" width="1456" height="916" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29297996" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -511,13 +621,14 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Thumbnails" weight="0.3295082" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.5081967" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.3849105" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
       <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
       <window_info anchor="bottom" id="Spring" order="8" />
       <window_info anchor="bottom" id="Terminal" order="9" />
@@ -539,7 +650,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2193646" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -547,22 +658,23 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.47540984" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
-      <window_info anchor="bottom" id="Spring" order="8" />
-      <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
-      <window_info anchor="bottom" id="Statistic" order="11" />
-      <window_info anchor="bottom" id="Java Enterprise" order="12" />
-      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="14" weight="0.32786885" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.52307695" />
+      <window_info anchor="bottom" id="Thumbnails" order="0" weight="0.3295082" />
+      <window_info anchor="bottom" id="Message" order="1" />
+      <window_info anchor="bottom" id="Find" order="2" />
+      <window_info anchor="bottom" id="Run" order="3" />
+      <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.49924356" weight="0.49344262" />
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Application Servers" order="8" weight="0.3276923" />
+      <window_info anchor="bottom" id="Spring" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
+      <window_info anchor="bottom" id="Statistic" order="12" />
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <window_info anchor="bottom" id="Database Changes" order="14" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="15" weight="0.32786885" />
+      <window_info anchor="bottom" id="Messages" order="16" weight="0.5229508" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -578,6 +690,16 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -587,7 +709,11 @@
     <MESSAGE value="修改权限问题" />
     <MESSAGE value="修改人员登录返回接口" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整理管线部分" />
+    <MESSAGE value="合并代码提交" />
+    <MESSAGE value="修改报警阈值" />
+    <MESSAGE value="修改巡检维护表字段" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护表字段" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -602,322 +728,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-532">
-          <caret line="50" column="28" lean-forward="true" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="19" column="60" selection-start-line="19" selection-start-column="60" selection-end-line="19" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="100" column="34" lean-forward="true" selection-start-line="100" selection-start-column="34" selection-end-line="100" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1474">
-          <caret line="84" column="58" selection-start-line="84" selection-start-column="58" selection-end-line="84" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1100">
-          <caret line="58" column="18" selection-start-line="58" selection-start-column="18" selection-end-line="58" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6842">
-          <caret line="329" selection-start-line="329" selection-end-line="329" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="102" column="24" lean-forward="true" selection-start-line="102" selection-start-column="24" selection-end-line="102" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="72" column="56" lean-forward="true" selection-start-line="72" selection-start-column="56" selection-end-line="72" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="90" column="39" lean-forward="true" selection-start-line="90" selection-start-column="39" selection-end-line="90" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="97" column="16" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
-          <caret line="14" column="52" lean-forward="true" selection-start-line="14" selection-start-column="52" selection-end-line="14" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="26" column="34" lean-forward="true" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="61" column="1" lean-forward="true" selection-start-line="61" selection-start-column="1" selection-end-line="61" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="208" column="49" lean-forward="true" selection-start-line="208" selection-start-column="49" selection-end-line="208" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="140" column="57" selection-start-line="140" selection-start-column="57" selection-end-line="140" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="111" column="36" selection-start-line="111" selection-start-column="36" selection-end-line="111" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="3" lean-forward="true" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="81" column="58" lean-forward="true" selection-start-line="81" selection-start-column="58" selection-end-line="81" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="472">
-          <caret line="118" column="59" selection-start-line="118" selection-start-column="59" selection-end-line="118" selection-end-column="59" />
-          <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-198">
-          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="69" column="32" lean-forward="true" selection-start-line="69" selection-start-column="32" selection-end-line="70" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="142" column="59" lean-forward="true" selection-start-line="142" selection-start-column="59" selection-end-line="142" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="349" column="9" lean-forward="true" selection-start-line="349" selection-start-column="9" selection-end-line="349" selection-end-column="9" />
-          <folding>
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="e#12105#12121#0" expanded="true" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-686">
-          <caret line="67" column="31" lean-forward="true" selection-start-line="67" selection-start-column="31" selection-end-line="67" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="93" column="24" lean-forward="true" selection-start-line="93" selection-start-column="24" selection-end-line="93" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="57" column="23" lean-forward="true" selection-start-line="57" selection-start-column="23" selection-end-line="57" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-408">
-          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="98" column="40" lean-forward="true" selection-start-line="98" selection-start-column="40" selection-end-line="98" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="572">
@@ -925,13 +735,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="328" column="32" lean-forward="true" selection-start-line="328" selection-start-column="32" selection-end-line="328" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
@@ -950,16 +753,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="396">
           <caret line="23" column="32" lean-forward="true" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
-          <folding>
-            <element signature="e#2635#2636#0" expanded="true" />
-            <element signature="e#2671#2672#0" expanded="true" />
-            <element signature="e#2727#2728#0" expanded="true" />
-            <element signature="e#2777#2778#0" expanded="true" />
-            <element signature="e#2877#2878#0" expanded="true" />
-            <element signature="e#2911#2912#0" expanded="true" />
-            <element signature="e#2963#2964#0" expanded="true" />
-            <element signature="e#3009#3010#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -972,14 +765,481 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+        <state relative-caret-position="66">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="59" column="46" lean-forward="true" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3586">
+          <caret line="179" column="16" selection-start-line="179" selection-start-column="16" selection-end-line="179" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5478">
+          <caret line="273" column="3" selection-start-line="273" selection-start-column="3" selection-end-line="273" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1870">
+          <caret line="147" column="11" selection-start-line="147" selection-start-column="11" selection-end-line="147" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="55" column="15" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="106">
+          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="290" column="41" lean-forward="true" selection-start-line="290" selection-start-column="41" selection-end-line="290" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="21" column="32" lean-forward="true" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="550">
+          <caret line="38" column="89" selection-start-line="38" selection-start-column="89" selection-end-line="38" selection-end-column="89" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="11" column="28" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1166">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="818">
+          <caret line="285" column="13" lean-forward="true" selection-start-line="285" selection-start-column="13" selection-end-line="285" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="129" column="31" lean-forward="true" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="323" column="72" lean-forward="true" selection-start-line="323" selection-start-column="72" selection-end-line="323" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="44" column="13" lean-forward="true" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-638">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="244">
+          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="157">
+          <caret line="16" column="55" lean-forward="true" selection-start-line="16" selection-start-column="55" selection-end-line="16" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="270" column="33" lean-forward="true" selection-start-line="270" selection-start-column="33" selection-end-line="270" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="490">
+          <caret line="141" selection-start-line="141" selection-end-line="141" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="164" column="5" lean-forward="true" selection-start-line="164" selection-start-column="5" selection-end-line="164" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/apiTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-242">
+          <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="61" column="16" lean-forward="true" selection-start-line="61" selection-start-column="16" selection-end-line="61" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="700">
+          <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="12" column="34" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="39" column="9" lean-forward="true" selection-start-line="39" selection-start-column="9" selection-end-line="39" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="32" column="29" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="29" />
           <folding>
-            <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-            <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#1838#1839#0" expanded="true" />
+            <element signature="e#1863#1864#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1925#1926#0" expanded="true" />
+            <element signature="e#1822#1823#0" expanded="true" />
+            <element signature="e#1851#1852#0" expanded="true" />
+            <element signature="e#1895#1896#0" expanded="true" />
+            <element signature="e#1931#1932#0" expanded="true" />
+            <element signature="e#2132#2133#0" expanded="true" />
+            <element signature="e#2164#2165#0" expanded="true" />
+            <element signature="e#2214#2215#0" expanded="true" />
+            <element signature="e#2256#2257#0" expanded="true" />
+            <element signature="e#2330#2331#0" expanded="true" />
+            <element signature="e#2370#2371#0" expanded="true" />
+            <element signature="e#2436#2437#0" expanded="true" />
+            <element signature="e#2494#2495#0" expanded="true" />
+            <element signature="e#2569#2570#0" expanded="true" />
+            <element signature="e#2602#2603#0" expanded="true" />
+            <element signature="e#2654#2655#0" expanded="true" />
+            <element signature="e#2698#2699#0" expanded="true" />
+            <element signature="e#2764#2765#0" expanded="true" />
+            <element signature="e#2795#2796#0" expanded="true" />
+            <element signature="e#2843#2844#0" expanded="true" />
+            <element signature="e#2883#2884#0" expanded="true" />
+            <element signature="e#2948#2949#0" expanded="true" />
+            <element signature="e#2980#2981#0" expanded="true" />
+            <element signature="e#3030#3031#0" expanded="true" />
+            <element signature="e#3072#3073#0" expanded="true" />
+            <element signature="e#3134#3135#0" expanded="true" />
+            <element signature="e#3162#3163#0" expanded="true" />
+            <element signature="e#3204#3205#0" expanded="true" />
+            <element signature="e#3238#3239#0" expanded="true" />
+            <element signature="e#3307#3308#0" expanded="true" />
+            <element signature="e#3346#3347#0" expanded="true" />
+            <element signature="e#3410#3411#0" expanded="true" />
+            <element signature="e#3466#3467#0" expanded="true" />
+            <element signature="e#3537#3538#0" expanded="true" />
+            <element signature="e#3567#3568#0" expanded="true" />
+            <element signature="e#3613#3614#0" expanded="true" />
+            <element signature="e#3651#3652#0" expanded="true" />
+            <element signature="e#3721#3722#0" expanded="true" />
+            <element signature="e#3759#3760#0" expanded="true" />
+            <element signature="e#3821#3822#0" expanded="true" />
+            <element signature="e#3875#3876#0" expanded="true" />
+            <element signature="e#3953#3954#0" expanded="true" />
+            <element signature="e#3991#3992#0" expanded="true" />
+            <element signature="e#4053#4054#0" expanded="true" />
+            <element signature="e#4107#4108#0" expanded="true" />
+            <element signature="e#4186#4187#0" expanded="true" />
+            <element signature="e#4225#4226#0" expanded="true" />
+            <element signature="e#4289#4290#0" expanded="true" />
+            <element signature="e#4345#4346#0" expanded="true" />
+            <element signature="e#4430#4431#0" expanded="true" />
+            <element signature="e#4474#4475#0" expanded="true" />
+            <element signature="e#4698#4699#0" expanded="true" />
+            <element signature="e#4740#4741#0" expanded="true" />
+            <element signature="e#4810#4811#0" expanded="true" />
+            <element signature="e#4872#4873#0" expanded="true" />
+            <element signature="e#4955#4956#0" expanded="true" />
+            <element signature="e#4994#4995#0" expanded="true" />
+            <element signature="e#5058#5059#0" expanded="true" />
+            <element signature="e#5114#5115#0" expanded="true" />
+            <element signature="e#5194#5195#0" expanded="true" />
+            <element signature="e#5233#5234#0" expanded="true" />
+            <element signature="e#5297#5298#0" expanded="true" />
+            <element signature="e#5353#5354#0" expanded="true" />
+            <element signature="e#5428#5429#0" expanded="true" />
+            <element signature="e#5462#5463#0" expanded="true" />
+            <element signature="e#5516#5517#0" expanded="true" />
+            <element signature="e#5562#5563#0" expanded="true" />
+            <element signature="e#5634#5635#0" expanded="true" />
+            <element signature="e#5670#5671#0" expanded="true" />
+            <element signature="e#5728#5729#0" expanded="true" />
+            <element signature="e#5778#5779#0" expanded="true" />
+            <element signature="e#5852#5853#0" expanded="true" />
+            <element signature="e#5888#5889#0" expanded="true" />
+            <element signature="e#5946#5947#0" expanded="true" />
+            <element signature="e#5996#5997#0" expanded="true" />
+            <element signature="e#6067#6068#0" expanded="true" />
+            <element signature="e#6100#6101#0" expanded="true" />
+            <element signature="e#6152#6153#0" expanded="true" />
+            <element signature="e#6196#6197#0" expanded="true" />
+            <element signature="e#6261#6262#0" expanded="true" />
+            <element signature="e#6291#6292#0" expanded="true" />
+            <element signature="e#6337#6338#0" expanded="true" />
+            <element signature="e#6375#6376#0" expanded="true" />
+            <element signature="e#6437#6438#0" expanded="true" />
+            <element signature="e#6467#6468#0" expanded="true" />
+            <element signature="e#6513#6514#0" expanded="true" />
+            <element signature="e#6551#6552#0" expanded="true" />
+            <element signature="e#6613#6614#0" expanded="true" />
+            <element signature="e#6643#6644#0" expanded="true" />
+            <element signature="e#6689#6690#0" expanded="true" />
+            <element signature="e#6727#6728#0" expanded="true" />
+            <element signature="e#6796#6797#0" expanded="true" />
+            <element signature="e#6829#6830#0" expanded="true" />
+            <element signature="e#6881#6882#0" expanded="true" />
+            <element signature="e#6925#6926#0" expanded="true" />
+            <element signature="e#6995#6996#0" expanded="true" />
+            <element signature="e#7030#7031#0" expanded="true" />
+            <element signature="e#7086#7087#0" expanded="true" />
+            <element signature="e#7134#7135#0" expanded="true" />
+            <element signature="e#7202#7203#0" expanded="true" />
+            <element signature="e#7233#7234#0" expanded="true" />
+            <element signature="e#7281#7282#0" expanded="true" />
+            <element signature="e#7321#7322#0" expanded="true" />
+            <element signature="e#7390#7391#0" expanded="true" />
+            <element signature="e#7426#7427#0" expanded="true" />
+            <element signature="e#7484#7485#0" expanded="true" />
+            <element signature="e#7534#7535#0" expanded="true" />
+            <element signature="e#7602#7603#0" expanded="true" />
+            <element signature="e#7636#7637#0" expanded="true" />
+            <element signature="e#7690#7691#0" expanded="true" />
+            <element signature="e#7736#7737#0" expanded="true" />
+            <element signature="e#7806#7807#0" expanded="true" />
+            <element signature="e#7840#7841#0" expanded="true" />
+            <element signature="e#7894#7895#0" expanded="true" />
+            <element signature="e#7940#7941#0" expanded="true" />
+            <element signature="e#8006#8007#0" expanded="true" />
+            <element signature="e#8036#8037#0" expanded="true" />
+            <element signature="e#8082#8083#0" expanded="true" />
+            <element signature="e#8120#8121#0" expanded="true" />
+            <element signature="e#8189#8190#0" expanded="true" />
+            <element signature="e#8226#8227#0" expanded="true" />
+            <element signature="e#8286#8287#0" expanded="true" />
+            <element signature="e#8338#8339#0" expanded="true" />
+            <element signature="e#8417#8418#0" expanded="true" />
+            <element signature="e#8457#8458#0" expanded="true" />
+            <element signature="e#8523#8524#0" expanded="true" />
+            <element signature="e#8581#8582#0" expanded="true" />
+            <element signature="e#8655#8656#0" expanded="true" />
+            <element signature="e#8687#8688#0" expanded="true" />
+            <element signature="e#8737#8738#0" expanded="true" />
+            <element signature="e#8779#8780#0" expanded="true" />
+            <element signature="e#8846#8847#0" expanded="true" />
+            <element signature="e#8879#8880#0" expanded="true" />
+            <element signature="e#8931#8932#0" expanded="true" />
+            <element signature="e#8975#8976#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#787#788#0" expanded="true" />
+            <element signature="e#817#818#0" expanded="true" />
+            <element signature="e#2105#2106#0" expanded="true" />
+            <element signature="e#2135#2136#0" expanded="true" />
+            <element signature="e#2431#2432#0" expanded="true" />
+            <element signature="e#2461#2462#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index 854f1f1..0db633a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -165,12 +165,16 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String startDay,String endDay) {
+    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew) {
         try {
 
             Criteria criteria = createCriteria(PgAlarm.class);
             criteria.addOrder(Order.desc("id"));
 
+            if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) {
+                criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
+            }
+
             if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay))
             {
                 criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay)));
@@ -193,9 +197,11 @@
 
                 criteria.add(Restrictions.le("alarmDate",date));
             }
+            if(StringUtils.isNotBlank(isNew)&&isNew.equals("true"))
+                criteria.add(Restrictions.eq("active", 1));
 
             List<PgAlarm> pgAlarmList = criteria.list();
-            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
     }
 
     //根据设备位置(仓位)获取摄像机列表
-    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+    public List<PgDeviceDto> getPgCameraListByPosition(String partition,String position){
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.like("position",position+"%"));
-//        criteria.add(Restrictions.eq("devType","球机"));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(position))
+            criteria.add(Restrictions.like("position",position+"%"));
+
         criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
 
         List<PgDevice> pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
             dto.setDevCode(objects[5].toString());
             dto.setDevType(objects[6].toString());
             if(objects[7]!=null)
-            dto.setIp(objects[7].toString());
+                dto.setIp(objects[7].toString());
             dto.setIsOpen(objects[8].toString());
             dto.setPartition(objects[11].toString());
             dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index 8ebf74d..3c657a7 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgEquipment;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
 import com.casic.PgInterface.devTable.dto.PgEquipmentDto;
@@ -34,9 +35,12 @@
     public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
-        criteria.add(Restrictions.eq("eqName",eqName));
-        criteria.add(Restrictions.eq("eqCode",eqCode));
-        criteria.add(Restrictions.eq("eqType",eqType));
+        if(StringUtils.isNotBlank(eqName))
+            criteria.add(Restrictions.eq("eqName",eqName));
+        if(StringUtils.isNotBlank(eqCode))
+            criteria.add(Restrictions.eq("eqCode",eqCode));
+        if(StringUtils.isNotBlank(eqType))
+            criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
@@ -51,10 +55,9 @@
 
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
-        //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
         String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
-        +eqType+"' group by equipment.EQ_NAME";
+                +eqType+"' group by equipment.EQ_NAME";
 
         List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4ed68e4..e413a5c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
@@ -39,7 +40,8 @@
 
     public List<PgPipeLineDto> getPipeLineByLineType(String lineType) {
         Criteria criteria = createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineType", lineType));
+        if(StringUtils.isNotBlank(lineType))
+            criteria.add(Restrictions.eq("lineType", lineType));
 
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    private Long id;
-    private String keyId;//巡检记录单id
-    private String planId;//巡检计划ID
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    @Column(name="KEY_ID")
-    public String getKeyId() {
-        return keyId;
-    }
-
-    public void setKeyId(String keyId) {
-        this.keyId = keyId;
-    }
-
-    @Column(name="PLAN_ID")
-    public String getPlanId() {
-        return planId;
-    }
-
-    public void setPlanId(String planId) {
-        this.planId = planId;
-    }
-
-    @Column(name="CREATE_DATE")
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    @Column(name="STATE")
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    @Column(name="CREATOR")
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    @Column(name="PLAN_NAME")
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    @Column(name="RECORD_NO")
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    @Column(name="PLAN_NO")
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    @Column(name="RESPONSIBIE_DEPT")
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    @Column(name="INSPECTION_PERSON")
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    @Column(name="PATROL_MAN")
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    @Column(name="OPERATE_DATE")
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    @Column(name="REMARK")
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Column(name="BUILD_CABIN")
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    @Column(name="PROJECT")
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    @Column(name="START_PILE_NO")
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    @Column(name="END_PILE_NO")
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    @Column(name="INSPECTION_PRACE")
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    @Column(name="OTHER_PATROL_MAN")
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private Long id;
+    private String KEY_ID;//唯一键值
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_PERSON;//巡检人
+    private String START_DATE;//巡检开始时间
+    private String END_DATE;
+    private String FREQUENCY;//巡检频率
+    private String STATE;//状态
+    private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+    private String PLAN_NO;//巡检计划编号
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_MODE;//巡检方式
+    private String INSPECTION_ROUTE;//巡检路线
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String INSPECTION_GROUP;//巡检部门
+    private String INSERT_TIME;//插入时间
+    private String FREQUENCYDATE;//巡检具体日期
+    private String FREQUENCYTIME;//巡检具体时间
+    private String CREATEDATE;//创建时间
+    private String CREATOR;//创建人
+    private String PROJECT;//项目
+    private String COMLILE;//编制人
+    private String START_TIME;//编制时间
+    private String DEVELOP_DEPT;//制定部门
+    private String END_TIME;//结束时间
+    private String START_PILE_NO;//开始桩号
+    private String END_PILE_NO;//结束桩号
+    private String BUILD_CABIN;//巡检舱室
+    private String MILEAGE;
+    private String FREQUENCY_TIME;//巡检具体时间
+    private String FREQUENCYTIME_END;
+    private String KETTLE_TS;
+    private String UPDATEDATE;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="KEY_ID")
+    public String getKEY_ID() {
+        return KEY_ID;
+    }
+
+    public void setKEY_ID(String KEY_ID) {
+        this.KEY_ID = KEY_ID;
+    }
+
+    @Column(name="PLAN_NAME")
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    @Column(name="INSPECTION_PERSON")
+    public String getINSPECTION_PERSON() {
+        return INSPECTION_PERSON;
+    }
+
+    public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+        this.INSPECTION_PERSON = INSPECTION_PERSON;
+    }
+
+    @Column(name="START_DATE")
+    public String getSTART_DATE() {
+        return START_DATE;
+    }
+
+    public void setSTART_DATE(String START_DATE) {
+        this.START_DATE = START_DATE;
+    }
+
+    @Column(name="END_DATE")
+    public String getEND_DATE() {
+        return END_DATE;
+    }
+
+    public void setEND_DATE(String END_DATE) {
+        this.END_DATE = END_DATE;
+    }
+
+    @Column(name="FREQUENCY")
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    @Column(name="STATE")
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    @Column(name="RESPONSIBLE_DEPT")
+    public String getRESPONSIBLE_DEPT() {
+        return RESPONSIBLE_DEPT;
+    }
+
+    public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+        this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+    }
+
+    @Column(name="PLAN_NO")
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    @Column(name="INSPECTION_TYPE")
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    @Column(name="INSPECTION_MODE")
+    public String getINSPECTION_MODE() {
+        return INSPECTION_MODE;
+    }
+
+    public void setINSPECTION_MODE(String INSPECTION_MODE) {
+        this.INSPECTION_MODE = INSPECTION_MODE;
+    }
+
+    @Column(name="INSPECTION_ROUTE")
+    public String getINSPECTION_ROUTE() {
+        return INSPECTION_ROUTE;
+    }
+
+    public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+        this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+    }
+
+    @Column(name="INSPECTION_START_TIME")
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    @Column(name="INSPECTION_END_TIME")
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    @Column(name="INSPECTION_PRACE")
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    @Column(name="INSPECTION_GROUP")
+    public String getINSPECTION_GROUP() {
+        return INSPECTION_GROUP;
+    }
+
+    public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+        this.INSPECTION_GROUP = INSPECTION_GROUP;
+    }
+
+    @Column(name="INSERT_TIME")
+    public String getINSERT_TIME() {
+        return INSERT_TIME;
+    }
+
+    public void setINSERT_TIME(String INSERT_TIME) {
+        this.INSERT_TIME = INSERT_TIME;
+    }
+
+    @Column(name="FREQUENCYDATE")
+    public String getFREQUENCYDATE() {
+        return FREQUENCYDATE;
+    }
+
+    public void setFREQUENCYDATE(String FREQUENCYDATE) {
+        this.FREQUENCYDATE = FREQUENCYDATE;
+    }
+
+    @Column(name="FREQUENCYTIME")
+    public String getFREQUENCYTIME() {
+        return FREQUENCYTIME;
+    }
+
+    public void setFREQUENCYTIME(String FREQUENCYTIME) {
+        this.FREQUENCYTIME = FREQUENCYTIME;
+    }
+
+    @Column(name="CREATEDATE")
+    public String getCREATEDATE() {
+        return CREATEDATE;
+    }
+
+    public void setCREATEDATE(String CREATEDATE) {
+        this.CREATEDATE = CREATEDATE;
+    }
+
+    @Column(name="CREATOR")
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    @Column(name="PROJECT")
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    @Column(name="COMLILE")
+    public String getCOMLILE() {
+        return COMLILE;
+    }
+
+    public void setCOMLILE(String COMLILE) {
+        this.COMLILE = COMLILE;
+    }
+
+    @Column(name="START_TIME")
+    public String getSTART_TIME() {
+        return START_TIME;
+    }
+
+    public void setSTART_TIME(String START_TIME) {
+        this.START_TIME = START_TIME;
+    }
+
+    @Column(name="DEVELOP_DEPT")
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    @Column(name="END_TIME")
+    public String getEND_TIME() {
+        return END_TIME;
+    }
+
+    public void setEND_TIME(String END_TIME) {
+        this.END_TIME = END_TIME;
+    }
+
+    @Column(name="START_PILE_NO")
+    public String getSTART_PILE_NO() {
+        return START_PILE_NO;
+    }
+
+    public void setSTART_PILE_NO(String START_PILE_NO) {
+        this.START_PILE_NO = START_PILE_NO;
+    }
+
+    @Column(name="END_PILE_NO")
+    public String getEND_PILE_NO() {
+        return END_PILE_NO;
+    }
+
+    public void setEND_PILE_NO(String END_PILE_NO) {
+        this.END_PILE_NO = END_PILE_NO;
+    }
+
+    @Column(name="BUILD_CABIN")
+    public String getBUILD_CABIN() {
+        return BUILD_CABIN;
+    }
+
+    public void setBUILD_CABIN(String BUILD_CABIN) {
+        this.BUILD_CABIN = BUILD_CABIN;
+    }
+
+    @Column(name="MILEAGE")
+    public String getMILEAGE() {
+        return MILEAGE;
+    }
+
+    public void setMILEAGE(String MILEAGE) {
+        this.MILEAGE = MILEAGE;
+    }
+
+    @Column(name="FREQUENCY_TIME")
+    public String getFREQUENCY_TIME() {
+        return FREQUENCY_TIME;
+    }
+
+    public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+        this.FREQUENCY_TIME = FREQUENCY_TIME;
+    }
+
+    @Column(name="FREQUENCYTIME_END")
+    public String getFREQUENCYTIME_END() {
+        return FREQUENCYTIME_END;
+    }
+
+    public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+        this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+    }
+
+    @Column(name="KETTLE_TS")
+    public String getKETTLE_TS() {
+        return KETTLE_TS;
+    }
+
+    public void setKETTLE_TS(String KETTLE_TS) {
+        this.KETTLE_TS = KETTLE_TS;
+    }
+
+    @Column(name="UPDATEDATE")
+    public String getUPDATEDATE() {
+        return UPDATEDATE;
+    }
+
+    public void setUPDATEDATE(String UPDATEDATE) {
+        this.UPDATEDATE = UPDATEDATE;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 5346b57..2f8d359 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -66,7 +66,7 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REPAIRMAN")
+    @Column(name="REOAIRMAN")
     public String getRepairMan() {
         return repairMan;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
-    private Long id;
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-
-
-    public static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
-        PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
-        pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
-        pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
-        pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
-        pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
-        pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
-        pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
-        pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
-        pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
-        pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
-        pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
-        pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
-        pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
-        pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
-        pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
-        return pgAssetInSpectionRecordDto;
-    }
-
-
-    public static List<PgAssetInSpectionRecordDto> ConvertToDtoList(List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList){
-        List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-        for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
-            pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
-        }
-
-        return pgAssetInSpectionRecordDtoList;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
-    private String num;
-    private String createDate;
-
-    public String getNum() {
-        return num;
-    }
-
-    public void setNum(String num) {
-        this.num = num;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+    private Long id;
+    private String PLAN_NO;//巡检计划编号
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String FREQUENCY;//巡检频率
+    private String CREATOR;//创建人
+    private String DEVELOP_DEPT;//制定部门
+    private String PROJECT;//项目
+    private String STATE;//状态
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+        PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+        pgAssetPlanDto.setId(pgAssetPlan.getId());
+        pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+        pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+        pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+        pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+        pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+        pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+        pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+        pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+        pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+        pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+        pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+        return pgAssetPlanDto;
+    }
+
+    public static List<PgAssetPlanDto> ConvertToPgAssetDtoList(List<PgAssetPlan> pgAssetPlanList){
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
+
+        for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+            pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+        }
+
+        return pgAssetPlanDtoList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
new file mode 100644
index 0000000..bc12db1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
@@ -0,0 +1,24 @@
+package com.casic.PgInterface.maintenance.dto;
+
+public class PgAssetPlanStatic {
+
+    private String num;
+    private String createDate;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
deleted file mode 100644
index c41ca7d..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.casic.PgInterface.maintenance.manager;
-
-import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
-
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
-        try {
-            String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
-                    "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
-                    "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-
-            if(patrolMan!=null)
-                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
-            if(startTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
-            if(endTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')<to_date('"+endTime+"','yyyy-MM-dd')";
-
-            sql+=" order by id";
-
-            List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
-
-            List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList=new ArrayList<>();
-            for(Object[] objects1:objects){
-                PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord();
-
-                pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString()));
-                pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1]));
-                pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2]));
-                pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3]));
-                pgAssetInSpectionRecord.setState(String.valueOf(objects1[4]));
-                pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5]));
-                pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6]));
-                pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7]));
-                pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8]));
-                pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9]));
-                pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10]));
-                pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11]));
-                pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12]));
-                pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13]));
-                pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14]));
-                pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15]));
-                pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16]));
-                pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17]));
-                pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18]));
-                pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19]));
-
-                pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord);
-            }
-
-            List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-            for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList)
-            {
-                pgAssetInSpectionRecordDtoList.add(PgAssetInSpectionRecordDto.ConvertToDto(pgAssetInSpectionRecord));
-            }
-
-            return pgAssetInSpectionRecordDtoList;
-        }
-        catch(Exception e)
-        {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public List<PgAssetInSpectionRecordStatic> getPgAssetInSpectionRecordStaticLisByTime(
-            String startTime, String endTime, String staticType) {
-
-        String sql="";
-        String dateType="";
-        List<PgAssetInSpectionRecordStatic> pgAssetInSpectionRecordStaticList=new ArrayList<>();
-        int type=Integer.valueOf(staticType);
-
-        switch(type) {
-            case 0://年
-                dateType = "yyyy";
-                break;
-            case 1://月
-                dateType = "yyyy-mm";
-                break;
-            case 2://周
-                dateType = "iw";
-                break;
-            case 3://日
-                dateType="yyyy-mm-dd";
-                break;
-            default:
-                break;
-        }
-
-        sql="select count(*), to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_RECORD t where 1=1";
-
-        if(startTime!=null)
-            sql+=" and t.CREATE_DATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
-        if(endTime!=null)
-            sql+=" and t.CREATE_DATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
-
-        sql+=" group by to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"')";
-
-        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
-        for(int i=0;i<objects.size();i++)
-        {
-            PgAssetInSpectionRecordStatic pgAssetInSpectionRecordStatic=new PgAssetInSpectionRecordStatic();
-            pgAssetInSpectionRecordStatic.setNum(objects.get(i)[0].toString());
-            pgAssetInSpectionRecordStatic.setCreateDate(objects.get(i)[1].toString());
-            pgAssetInSpectionRecordStaticList.add(pgAssetInSpectionRecordStatic);
-        }
-        return pgAssetInSpectionRecordStaticList;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
new file mode 100644
index 0000000..bb6bf1e
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
@@ -0,0 +1,81 @@
+package com.casic.PgInterface.maintenance.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgAssetPlanManager extends HibernateEntityDao<PgAssetPlan> {
+
+    public List<PgAssetPlanDto> getPgAssetPlanDtoList(String inSpectionPlace){
+        Criteria criteria=createCriteria(PgAssetPlan.class);
+
+        if(StringUtils.isNotBlank(inSpectionPlace))
+            criteria.add(Restrictions.like("INSPECTION_PRACE","%"+inSpectionPlace+"%"));
+        criteria.addOrder(Order.desc("id"));
+
+        List<PgAssetPlan> pgAssetPlanList=criteria.list();
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=PgAssetPlanDto.ConvertToPgAssetDtoList(pgAssetPlanList);
+
+        if(pgAssetPlanDtoList==null||pgAssetPlanDtoList.size()==0)
+            return null;
+        else
+            return pgAssetPlanDtoList;
+    }
+
+    public List<PgAssetPlanStatic> getPgAssetPlanStaticLisByTime(
+            String startTime, String endTime, String staticType) {
+
+        String sql="";
+        String dateType="";
+        List<PgAssetPlanStatic> pgAssetPlanStaticList=new ArrayList<>();
+        int type=Integer.valueOf(staticType);
+
+        switch(type) {
+            case 0://年
+                dateType = "yyyy";
+                break;
+            case 1://月
+                dateType = "yyyy-mm";
+                break;
+            case 2://周
+                dateType = "iw";
+                break;
+            case 3://日
+                dateType="yyyy-mm-dd";
+                break;
+            default:
+                break;
+        }
+
+        sql="select count(*), to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_PLAN t where 1=1";
+
+        if(startTime!=null)
+            sql+=" and t.CREATEDATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
+        if(endTime!=null)
+            sql+=" and t.CREATEDATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
+
+        sql+=" group by to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"')";
+
+        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
+        for(int i=0;i<objects.size();i++)
+        {
+            PgAssetPlanStatic pgAssetPlanStatic=new PgAssetPlanStatic();
+            pgAssetPlanStatic.setNum(objects.get(i)[0].toString());
+            pgAssetPlanStatic.setCreateDate(objects.get(i)[1].toString());
+            pgAssetPlanStaticList.add(pgAssetPlanStatic);
+        }
+        return pgAssetPlanStaticList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 0903f22..3484739 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -15,7 +15,7 @@
 
     public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
             if(repairMan!=null)
                 sql+=" and REPAIRMAN like '%"+repairMan+"%'";
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index 9cc2881..6d90d7b 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -1,5 +1,7 @@
 package com.casic.PgInterface.patroler.dto;
 
+import com.casic.PgInterface.devTable.domain.PgDevice;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 
 /**
@@ -14,6 +16,7 @@
     private String unit;//单位
     private String alarmType;//报警类型
     private Long pgDeviceId;//设备编号
+    private String assetCode;//资产编号
 
     public Long getId() {
         return id;
@@ -71,7 +74,15 @@
         this.pgDeviceId = pgDeviceId;
     }
 
-    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
+    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule, PgDeviceManager pgDeviceManager) {
         this.setId(pgAlarmRule.getId());
         this.setHighValue(pgAlarmRule.getHighValue());
         this.setLowValue(pgAlarmRule.getLowValue());
@@ -82,6 +93,10 @@
         else
             this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
         this.setPgDeviceId(pgAlarmRule.getPgDeviceId());
+        if(pgAlarmRule.getAlarmTypeId()!=null&&pgDeviceManager.get(pgAlarmRule.getPgDeviceId())!=null)
+            this.setAssetCode(pgDeviceManager.get(pgAlarmRule.getPgDeviceId()).getAssetCode());
+        else
+            this.setAssetCode("");
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
index c132c98..a7cef5b 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
@@ -1,13 +1,17 @@
 package com.casic.PgInterface.patroler.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.ResponseStatus;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -17,30 +21,23 @@
 @Service
 public class PgAlarmRuleManager extends HibernateEntityDao<PgAlarmRule> {
 
+    @Resource
+    private PgDeviceManager pgDeviceManager;
+
     //根据设备获取设备报警阈值
-    public List<PgAlarmRuleDto>  getAlarmRuleDto() {
+    public List<PgAlarmRuleDto>  getAlarmRuleDto(String devType) {
         Criteria criteria=createCriteria(PgAlarmRule.class);
+
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.eq("devType", devType));
         criteria.addOrder(Order.desc("id"));
 
         List<PgAlarmRule> pgAlarmRuleList=criteria.list();
-        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
+        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         for (PgAlarmRule pgAlarmRule : pgAlarmRuleList) {
-            pgAlarmRuleDtoList.add(new PgAlarmRuleDto(pgAlarmRule));
+            pgAlarmRuleDtoList.add(new PgAlarmRuleDto(pgAlarmRule,pgDeviceManager));
         }
         return pgAlarmRuleDtoList;
-
     }
 
-    public PgAlarmRule getAlarmRuleBydevType(String devType) {
-        Criteria criteria=createCriteria(PgAlarmRule.class);
-        criteria.add(Restrictions.eq("devType", devType));
-
-        List<PgAlarmRule> pgAlarmRuleList=criteria.list();
-
-        if(pgAlarmRuleList==null||pgAlarmRuleList.size()==0)
-            return null;
-        else
-            return pgAlarmRuleList.get(0);
-    }
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index d0e28f5..082ba5d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgAlarm;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
@@ -39,7 +40,7 @@
     private PgReservePlanManager pgReservePlanManager;
 
     /*
-    * 获取报警设备信息
+     * 获取报警设备信息
      */
     @POST
     @Path("linkDevice")
@@ -50,11 +51,22 @@
 
         PgDeviceDto pgDeviceDto = null;
         try {
-            PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
-            PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
-
-            pgDeviceDto=new PgDeviceDto(pgDevice);
-            msg = "报警关联设备获取成功";
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if (pgAlarm == null)
+                    msg = "不存在报警信息";
+                else {
+                    PgDevice pgDevice = pgAlarm.getAlarmDevId();
+                    if (pgDevice == null)
+                        msg = "不存在报警设备";
+                    else {
+                        pgDeviceDto = new PgDeviceDto(pgDevice);
+                        msg = "报警关联设备获取成功";
+                    }
+                }
+            }
+            else
+                msg="未接受到报警设备ID信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取关联设备失败";
@@ -77,11 +89,28 @@
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
-            PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
-            PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
-            pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if(pgAlarm==null)
+                    msg="不存在报警信息";
+                else {
+                    PgDevice pgDevice = pgAlarm.getAlarmDevId();
+                    if (pgDevice == null)
+                        msg = "不存在报警设备";
+                    else {
+                        String strPosition=pgDevice.getPosition();
+                        String position="";
+                        if(!strPosition.equals(""))
+                            position=pgDevice.getPosition().substring(0,3);
+                        String partition=pgDevice.getPartition();
 
-            msg = "关联设备获取成功";
+                        pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
+                        msg = "关联设备获取成功";
+                    }
+                }
+            }
+            else
+                msg="请输入报警设备Id信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "分区设备关联失败";
@@ -93,7 +122,7 @@
 
     /*
      * 根据报警记录获取关联的预案
-    */
+     */
     @POST
     @Path("linkReservePlan")
     @Produces(MediaType.APPLICATION_JSON)
@@ -103,10 +132,21 @@
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
-            PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
-            pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if (pgAlarm == null)
+                    msg = "不存在报警信息";
+                else {
+                    pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-            msg="关联预案获取成功";
+                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
+                        msg="不存在关联的报警预案";
+                    else
+                        msg = "关联预案获取成功";
+                }
+            }
+            else
+                msg="请输入报警信息";
         }
         catch(Exception e)
         {
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index d18ebb8..baacd93 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -48,14 +48,16 @@
     @POST
     @Path("getAlarmInfo")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmList(@FormParam("startDay") String startDay,
-                                            @FormParam("endDay") String endDay) throws Exception {
+    public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
+                                            @FormParam("startDay") String startDay,
+                                            @FormParam("endDay") String endDay,
+                                            @FormParam("isNew") String isNew) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(startDay,endDay);
-            if (pgAlarmDtoList.size() == 0)
+            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew);
+            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
                 msg = "没有报警信息";
             else
                 msg = "报警信息获取成功";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 87afd54..29ce8a4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -1,7 +1,5 @@
 package com.casic.PgInterface.rs;
 
-import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager;
-import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import com.casic.PgInterface.patroler.manager.PgAlarmRuleManager;
@@ -30,119 +28,23 @@
     private static Logger logger = LoggerFactory.getLogger(PgAlarmRule.class);
 
     @Resource
-    private PgDeviceManager pgDeviceManager;
-    @Resource
-    private PgAlarmTypeManager pgAlarmTypeManager;
-    @Resource
     private PgAlarmRuleManager pgAlarmRuleManager;
 
-
-
-    /**
-     * 新增报警阈值
-     */
-    @POST
-    @Path("addAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> addAlarmRule(@FormParam("highValue") String highValue,
-                                            @FormParam("lowValue") String lowValue,
-                                            @FormParam("unit") String unit,
-                                            @FormParam("devType") String devType,
-                                            @FormParam("alarmType") String alarmType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType);
-            if (pgAlarmRule != null) {
-                result = "false";
-                msg = "设备阈值已经存在";
-            } else {
-                pgAlarmRule = new PgAlarmRule();
-                pgAlarmRule.setHighValue(highValue);
-                pgAlarmRule.setLowValue(lowValue);
-                pgAlarmRule.setDevType(devType);
-                pgAlarmRule.setUnit(unit);
-                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
-
-                pgAlarmRuleManager.save(pgAlarmRule);
-                result = "true";
-                msg = "报警阈值新增成功";
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = "false";
-            msg = "报警阈值新增失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-        return resultMap;
-    }
-
-    /**
-     * 编辑报警阈值
-     */
-    @POST
-    @Path("editAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> editAlarmRule(@FormParam("id") String id,
-                                             @FormParam("devType") String devType,
-                                             @FormParam("highValue") String highValue,
-                                             @FormParam("lowValue") String lowValue,
-                                             @FormParam("unit") String unit,
-                                             @FormParam("alarmType") String alarmType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
-            if (pgAlarmRule == null) {
-                msg = "不存在报警阈值记录";
-                result = "false";
-            } else {
-                pgAlarmRule.setDevType(devType);
-                pgAlarmRule.setHighValue(highValue);
-                pgAlarmRule.setLowValue(lowValue);
-                pgAlarmRule.setUnit(unit);
-                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
-
-                pgAlarmRuleManager.save(pgAlarmRule);
-                msg = "编辑成功";
-                result = "true";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            result = "false";
-            msg = "报警阈值编辑失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-
-        return resultMap;
-    }
-
     /**
      * 获取报警阈值信息
      */
     @POST
     @Path("getAlarmRule")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmRule() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+    public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
+        System.out.println("devType:"+devType);
+        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
-            pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto();
-            if (pgAlarmRuleDtoList == null)
+            pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
+            if (pgAlarmRuleDtoList == null||pgAlarmRuleDtoList.size()==0)
                 msg = "不存在报警阈值信息";
             else
                 msg = "报警阈值获取成功";
@@ -155,69 +57,4 @@
         return resultMap;
     }
 
-    /**
-     * 删除报警阈值
-     */
-    @POST
-    @Path("deleteAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> deleteAlarmRule(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
-            if (pgAlarmRule == null) {
-                msg = "不存在报警阈值记录";
-                result = "false";
-            } else {
-                pgAlarmRuleManager.remove(pgAlarmRule);
-                msg = "删除成功";
-                result = "true";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            result = "false";
-            msg = "报警阈值删除失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-
-        return resultMap;
-    }
-
-    /**
-     * 根据设备类型报警阈值
-     */
-    @POST
-    @Path("getAlarmRuleByDevType")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmRuleByDevType(@FormParam("devType") String devType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        PgAlarmRule pgAlarmRule = null;
-        List<PgAlarmRuleDto> pgAlarmRuleDtos = new ArrayList<>();
-        try {
-            pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType);
-            if (pgAlarmRule == null)
-                msg = "不存在报警阈值记录";
-            else {
-                PgAlarmRuleDto pgAlarmRuleDto= new PgAlarmRuleDto(pgAlarmRule);
-                pgAlarmRuleDtos.add(pgAlarmRuleDto);
-                msg = "报警阈值获取成功";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            msg = "报警阈值获取失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmRuleDtos);
-
-        return resultMap;
-    }
-
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
new file mode 100644
index 0000000..19d3b8c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanRs")
+public class PgAssetPlanRs {
+
+    @Resource
+    private PgAssetPlanManager pgAssetPlanManager;
+
+    /**
+     * 获取巡检记录
+     */
+    @POST
+    @Path("getPgAssetPlanList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPgAssetPlanList(@FormParam("inSpectionPlace") String inSpectionPlace){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
+        try{
+            pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(inSpectionPlace);
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
+                msg="巡检信息获取成功";
+            else
+                msg="不存在巡检信息";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="巡检信息获取失败";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAssetPlanDtoList);
+
+        return resultMap;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
new file mode 100644
index 0000000..47ef9d1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanStaticRs")
+public class PgAssetPlanStaticRs {
+
+    @Resource
+    private PgAssetPlanManager pgAssetPlanManager;
+
+    @POST
+    @Path("getPgAssetPlanStaticList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPgAssetPlanStaticList(@FormParam("startTime") String startTime,
+                                                       @FormParam("endTime") String endTime,
+                                                       @FormParam("staticType") String staticType) throws Exception{
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
+        try{
+            pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
+                msg="巡检统计信息获取成功";
+            else
+                msg="统计信息获取失败";
+        }
+        catch (Exception ex){
+            ex.printStackTrace();
+            msg="统计失败";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAssetPlanStaticList);
+
+        return resultMap;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
deleted file mode 100644
index 66f4d09..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.manager.PgAssetInSpectionRecordManager;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@Path("pgAssetRecordRs")
-public class PgAssetRecordRs {
-
-    @Resource
-    private PgAssetInSpectionRecordManager pgAssetInSpectionRecordManager;
-
-    /**
-     * 获取巡检记录
-     */
-    @POST
-    @Path("getPgAssetRecordList")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgAssetRecordList(@FormParam("patrolMan") String patrolMan,
-                                                   @FormParam("startTime") String startTime,
-                                                   @FormParam("endTime") String endTime){
-        Map<String,Object> resultMap=new HashMap<>();
-        String msg="";
-
-        List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-        try{
-            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(patrolMan,startTime,endTime);
-            if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0)
-                msg="巡检信息获取成功";
-            else
-                msg="不存在巡检信息";
-        }
-        catch(Exception ex){
-            ex.printStackTrace();
-            msg="巡检信息获取失败";
-        }
-
-        resultMap.put("msg",msg);
-        resultMap.put("result",pgAssetInSpectionRecordDtoList);
-
-        return resultMap;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java
deleted file mode 100644
index 5f0417a..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import com.casic.PgInterface.maintenance.manager.PgAssetInSpectionRecordManager;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@Path("pgAssetRecordStaticRs")
-public class PgAssetRecordStaticRs {
-
-    @Resource
-    private PgAssetInSpectionRecordManager pgAssetInSpectionRecordManager;
-
-    @POST
-    @Path("getPgAssetRecordHeadStaticList")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgAssetRecordHeadStaticList(@FormParam("startTime") String startTime,
-                                                                @FormParam("endTime") String endTime,
-                                                                @FormParam("staticType") String staticType) throws Exception{
-        Map<String,Object> resultMap=new HashMap<>();
-        String msg="";
-        String result="";
-
-        List<PgAssetInSpectionRecordStatic> pgAssetInSpectionRecordStaticList = null;
-        try{
-            pgAssetInSpectionRecordStaticList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetInSpectionRecordStaticList!=null&&pgAssetInSpectionRecordStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
-            else
-                msg="统计信息获取失败";
-        }
-        catch (Exception ex){
-            ex.printStackTrace();
-            msg="统计失败";
-        }
-
-        resultMap.put("msg",msg);
-        resultMap.put("result",pgAssetInSpectionRecordStaticList);
-
-        return resultMap;
-    }
-
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index 9dfdd88..a0245ba 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -326,7 +326,7 @@
 
             PgConstruction pgConstruction=pgConstructionManager.get(Long.valueOf(id));
 
-            pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(pgConstruction.getPgName());
+            pgDeviceDtoList=pgDeviceManager.getPgCameraListByPartition(pgConstruction.getPgName());
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index 1c8130c..c276fb3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -177,6 +177,7 @@
             else
             {
                 pgEquipment.setActive(0);
+                pgEquipmentManager.save(pgEquipment);
                 msg="删除成功";
                 result="true";
             }

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ff69e2a..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,27 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190828.docx" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -32,72 +42,119 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="2" />
-          <entry key="java" value="243" />
-          <entry key="properties" value="6" />
+          <entry key="java" value="321" />
+          <entry key="properties" value="8" />
           <entry key="xml" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
-          <entry key="JAVA" value="243" />
-          <entry key="Properties" value="6" />
+          <entry key="JAVA" value="321" />
+          <entry key="Properties" value="8" />
           <entry key="XML" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="8082" />
-          <entry key="properties" value="49" />
-          <entry key="txt" value="64" />
+          <entry key="dummy" value="16" />
+          <entry key="java" value="10723" />
+          <entry key="properties" value="59" />
+          <entry key="txt" value="118" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="8082" />
-          <entry key="PLAIN_TEXT" value="64" />
-          <entry key="Properties" value="49" />
+          <entry key="JAVA" value="10723" />
+          <entry key="PLAIN_TEXT" value="134" />
+          <entry key="Properties" value="59" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="4" />
+          <entry key="project.closed" value="28" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
           <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.24" value="1" />
+          <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="1" />
-          <entry key="project.open.time.3" value="3" />
-          <entry key="project.open.time.31" value="1" />
+          <entry key="project.open.time.28" value="1" />
+          <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.31" value="2" />
           <entry key="project.open.time.37" value="1" />
+          <entry key="project.open.time.39" value="2" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.40" value="1" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="1" />
+          <entry key="project.open.time.44" value="2" />
           <entry key="project.open.time.45" value="2" />
           <entry key="project.open.time.48" value="1" />
           <entry key="project.open.time.49" value="1" />
+          <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.58" value="1" />
           <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.71" value="1" />
+          <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.71" value="2" />
           <entry key="project.open.time.76" value="1" />
-          <entry key="project.opened" value="25" />
+          <entry key="project.opened" value="41" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+            <state relative-caret-position="174">
+              <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
               <folding>
-                <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-                <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="352">
+              <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#787#788#0" expanded="true" />
+                <element signature="e#817#818#0" expanded="true" />
+                <element signature="e#2105#2106#0" expanded="true" />
+                <element signature="e#2135#2136#0" expanded="true" />
+                <element signature="e#2431#2432#0" expanded="true" />
+                <element signature="e#2461#2462#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="638">
+              <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+              <folding>
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -122,6 +179,7 @@
       <find>getPgDeviceByDevType</find>
       <find>message</find>
       <find>getConstructionByType</find>
+      <find>getPgCameraListByPosition</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -130,24 +188,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanTypeDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
@@ -162,17 +207,38 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
       </list>
     </option>
   </component>
@@ -208,16 +274,18 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="3" />
-    <option name="y" value="10" />
-    <option name="width" value="1386" />
-    <option name="height" value="788" />
+    <option name="x" value="1410" />
+    <option name="y" value="117" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -258,7 +326,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -267,16 +335,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -286,7 +345,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="dto" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -296,7 +355,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="manager" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -308,19 +367,10 @@
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="webapp" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -359,6 +409,7 @@
       </deployment>
       <server-settings>
         <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_7" />
+        <option name="JNDI_PORT" value="10991" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -456,7 +507,23 @@
       <workItem from="1566350810712" duration="6803000" />
       <workItem from="1566435787074" duration="10717000" />
       <workItem from="1566521753529" duration="14265000" />
-      <workItem from="1566614176989" duration="5693000" />
+      <workItem from="1566614176989" duration="14059000" />
+      <workItem from="1566780822009" duration="1026000" />
+      <workItem from="1566891563975" duration="284000" />
+      <workItem from="1566893107340" duration="3382000" />
+      <workItem from="1566953794976" duration="11039000" />
+      <workItem from="1567059357700" duration="484000" />
+      <workItem from="1567082835097" duration="1086000" />
+      <workItem from="1567126428020" duration="1539000" />
+      <workItem from="1567129277820" duration="5788000" />
+      <workItem from="1567136008996" duration="2568000" />
+      <workItem from="1567237040302" duration="111000" />
+      <workItem from="1567495626345" duration="2797000" />
+      <workItem from="1567558770152" duration="2352000" />
+      <workItem from="1567577368149" duration="640000" />
+      <workItem from="1567751224608" duration="780000" />
+      <workItem from="1568019299799" duration="695000" />
+      <workItem from="1568082566133" duration="4016000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -493,17 +560,60 @@
       <option name="project" value="LOCAL" />
       <updated>1566553388171</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="整理管线部分">
+      <created>1566620046627</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1566620046627</updated>
+    </task>
+    <task id="LOCAL-00007" summary="合并代码提交">
+      <created>1566781001910</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1566781001910</updated>
+    </task>
+    <task id="LOCAL-00008" summary="合并代码提交">
+      <created>1566963831930</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1566963831930</updated>
+    </task>
+    <task id="LOCAL-00009" summary="修改报警阈值">
+      <created>1566972146710</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1566972146710</updated>
+    </task>
+    <task id="LOCAL-00010" summary="修改巡检维护表字段">
+      <created>1567126525554</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1567126525554</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="142930000" />
+    <option name="totallyTimeSpent" value="189883000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
+    <frame x="1358" y="-8" width="1456" height="916" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29297996" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -511,13 +621,14 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Thumbnails" weight="0.3295082" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.5081967" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.3849105" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
       <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
       <window_info anchor="bottom" id="Spring" order="8" />
       <window_info anchor="bottom" id="Terminal" order="9" />
@@ -539,7 +650,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2193646" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -547,22 +658,23 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.47540984" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
-      <window_info anchor="bottom" id="Spring" order="8" />
-      <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
-      <window_info anchor="bottom" id="Statistic" order="11" />
-      <window_info anchor="bottom" id="Java Enterprise" order="12" />
-      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="14" weight="0.32786885" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.52307695" />
+      <window_info anchor="bottom" id="Thumbnails" order="0" weight="0.3295082" />
+      <window_info anchor="bottom" id="Message" order="1" />
+      <window_info anchor="bottom" id="Find" order="2" />
+      <window_info anchor="bottom" id="Run" order="3" />
+      <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.49924356" weight="0.49344262" />
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Application Servers" order="8" weight="0.3276923" />
+      <window_info anchor="bottom" id="Spring" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
+      <window_info anchor="bottom" id="Statistic" order="12" />
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <window_info anchor="bottom" id="Database Changes" order="14" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="15" weight="0.32786885" />
+      <window_info anchor="bottom" id="Messages" order="16" weight="0.5229508" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -578,6 +690,16 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -587,7 +709,11 @@
     <MESSAGE value="修改权限问题" />
     <MESSAGE value="修改人员登录返回接口" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整理管线部分" />
+    <MESSAGE value="合并代码提交" />
+    <MESSAGE value="修改报警阈值" />
+    <MESSAGE value="修改巡检维护表字段" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护表字段" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -602,322 +728,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-532">
-          <caret line="50" column="28" lean-forward="true" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="19" column="60" selection-start-line="19" selection-start-column="60" selection-end-line="19" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="100" column="34" lean-forward="true" selection-start-line="100" selection-start-column="34" selection-end-line="100" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1474">
-          <caret line="84" column="58" selection-start-line="84" selection-start-column="58" selection-end-line="84" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1100">
-          <caret line="58" column="18" selection-start-line="58" selection-start-column="18" selection-end-line="58" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6842">
-          <caret line="329" selection-start-line="329" selection-end-line="329" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="102" column="24" lean-forward="true" selection-start-line="102" selection-start-column="24" selection-end-line="102" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="72" column="56" lean-forward="true" selection-start-line="72" selection-start-column="56" selection-end-line="72" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="90" column="39" lean-forward="true" selection-start-line="90" selection-start-column="39" selection-end-line="90" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="97" column="16" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
-          <caret line="14" column="52" lean-forward="true" selection-start-line="14" selection-start-column="52" selection-end-line="14" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="26" column="34" lean-forward="true" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="61" column="1" lean-forward="true" selection-start-line="61" selection-start-column="1" selection-end-line="61" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="208" column="49" lean-forward="true" selection-start-line="208" selection-start-column="49" selection-end-line="208" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="140" column="57" selection-start-line="140" selection-start-column="57" selection-end-line="140" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="111" column="36" selection-start-line="111" selection-start-column="36" selection-end-line="111" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="3" lean-forward="true" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="81" column="58" lean-forward="true" selection-start-line="81" selection-start-column="58" selection-end-line="81" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="472">
-          <caret line="118" column="59" selection-start-line="118" selection-start-column="59" selection-end-line="118" selection-end-column="59" />
-          <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-198">
-          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="69" column="32" lean-forward="true" selection-start-line="69" selection-start-column="32" selection-end-line="70" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="142" column="59" lean-forward="true" selection-start-line="142" selection-start-column="59" selection-end-line="142" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="349" column="9" lean-forward="true" selection-start-line="349" selection-start-column="9" selection-end-line="349" selection-end-column="9" />
-          <folding>
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="e#12105#12121#0" expanded="true" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-686">
-          <caret line="67" column="31" lean-forward="true" selection-start-line="67" selection-start-column="31" selection-end-line="67" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="93" column="24" lean-forward="true" selection-start-line="93" selection-start-column="24" selection-end-line="93" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="57" column="23" lean-forward="true" selection-start-line="57" selection-start-column="23" selection-end-line="57" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-408">
-          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="98" column="40" lean-forward="true" selection-start-line="98" selection-start-column="40" selection-end-line="98" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="572">
@@ -925,13 +735,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="328" column="32" lean-forward="true" selection-start-line="328" selection-start-column="32" selection-end-line="328" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
@@ -950,16 +753,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="396">
           <caret line="23" column="32" lean-forward="true" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
-          <folding>
-            <element signature="e#2635#2636#0" expanded="true" />
-            <element signature="e#2671#2672#0" expanded="true" />
-            <element signature="e#2727#2728#0" expanded="true" />
-            <element signature="e#2777#2778#0" expanded="true" />
-            <element signature="e#2877#2878#0" expanded="true" />
-            <element signature="e#2911#2912#0" expanded="true" />
-            <element signature="e#2963#2964#0" expanded="true" />
-            <element signature="e#3009#3010#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -972,14 +765,481 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+        <state relative-caret-position="66">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="59" column="46" lean-forward="true" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3586">
+          <caret line="179" column="16" selection-start-line="179" selection-start-column="16" selection-end-line="179" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5478">
+          <caret line="273" column="3" selection-start-line="273" selection-start-column="3" selection-end-line="273" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1870">
+          <caret line="147" column="11" selection-start-line="147" selection-start-column="11" selection-end-line="147" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="55" column="15" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="106">
+          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="290" column="41" lean-forward="true" selection-start-line="290" selection-start-column="41" selection-end-line="290" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="21" column="32" lean-forward="true" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="550">
+          <caret line="38" column="89" selection-start-line="38" selection-start-column="89" selection-end-line="38" selection-end-column="89" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="11" column="28" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1166">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="818">
+          <caret line="285" column="13" lean-forward="true" selection-start-line="285" selection-start-column="13" selection-end-line="285" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="129" column="31" lean-forward="true" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="323" column="72" lean-forward="true" selection-start-line="323" selection-start-column="72" selection-end-line="323" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="44" column="13" lean-forward="true" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-638">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="244">
+          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="157">
+          <caret line="16" column="55" lean-forward="true" selection-start-line="16" selection-start-column="55" selection-end-line="16" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="270" column="33" lean-forward="true" selection-start-line="270" selection-start-column="33" selection-end-line="270" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="490">
+          <caret line="141" selection-start-line="141" selection-end-line="141" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="164" column="5" lean-forward="true" selection-start-line="164" selection-start-column="5" selection-end-line="164" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/apiTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-242">
+          <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="61" column="16" lean-forward="true" selection-start-line="61" selection-start-column="16" selection-end-line="61" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="700">
+          <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="12" column="34" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="39" column="9" lean-forward="true" selection-start-line="39" selection-start-column="9" selection-end-line="39" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="32" column="29" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="29" />
           <folding>
-            <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-            <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#1838#1839#0" expanded="true" />
+            <element signature="e#1863#1864#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1925#1926#0" expanded="true" />
+            <element signature="e#1822#1823#0" expanded="true" />
+            <element signature="e#1851#1852#0" expanded="true" />
+            <element signature="e#1895#1896#0" expanded="true" />
+            <element signature="e#1931#1932#0" expanded="true" />
+            <element signature="e#2132#2133#0" expanded="true" />
+            <element signature="e#2164#2165#0" expanded="true" />
+            <element signature="e#2214#2215#0" expanded="true" />
+            <element signature="e#2256#2257#0" expanded="true" />
+            <element signature="e#2330#2331#0" expanded="true" />
+            <element signature="e#2370#2371#0" expanded="true" />
+            <element signature="e#2436#2437#0" expanded="true" />
+            <element signature="e#2494#2495#0" expanded="true" />
+            <element signature="e#2569#2570#0" expanded="true" />
+            <element signature="e#2602#2603#0" expanded="true" />
+            <element signature="e#2654#2655#0" expanded="true" />
+            <element signature="e#2698#2699#0" expanded="true" />
+            <element signature="e#2764#2765#0" expanded="true" />
+            <element signature="e#2795#2796#0" expanded="true" />
+            <element signature="e#2843#2844#0" expanded="true" />
+            <element signature="e#2883#2884#0" expanded="true" />
+            <element signature="e#2948#2949#0" expanded="true" />
+            <element signature="e#2980#2981#0" expanded="true" />
+            <element signature="e#3030#3031#0" expanded="true" />
+            <element signature="e#3072#3073#0" expanded="true" />
+            <element signature="e#3134#3135#0" expanded="true" />
+            <element signature="e#3162#3163#0" expanded="true" />
+            <element signature="e#3204#3205#0" expanded="true" />
+            <element signature="e#3238#3239#0" expanded="true" />
+            <element signature="e#3307#3308#0" expanded="true" />
+            <element signature="e#3346#3347#0" expanded="true" />
+            <element signature="e#3410#3411#0" expanded="true" />
+            <element signature="e#3466#3467#0" expanded="true" />
+            <element signature="e#3537#3538#0" expanded="true" />
+            <element signature="e#3567#3568#0" expanded="true" />
+            <element signature="e#3613#3614#0" expanded="true" />
+            <element signature="e#3651#3652#0" expanded="true" />
+            <element signature="e#3721#3722#0" expanded="true" />
+            <element signature="e#3759#3760#0" expanded="true" />
+            <element signature="e#3821#3822#0" expanded="true" />
+            <element signature="e#3875#3876#0" expanded="true" />
+            <element signature="e#3953#3954#0" expanded="true" />
+            <element signature="e#3991#3992#0" expanded="true" />
+            <element signature="e#4053#4054#0" expanded="true" />
+            <element signature="e#4107#4108#0" expanded="true" />
+            <element signature="e#4186#4187#0" expanded="true" />
+            <element signature="e#4225#4226#0" expanded="true" />
+            <element signature="e#4289#4290#0" expanded="true" />
+            <element signature="e#4345#4346#0" expanded="true" />
+            <element signature="e#4430#4431#0" expanded="true" />
+            <element signature="e#4474#4475#0" expanded="true" />
+            <element signature="e#4698#4699#0" expanded="true" />
+            <element signature="e#4740#4741#0" expanded="true" />
+            <element signature="e#4810#4811#0" expanded="true" />
+            <element signature="e#4872#4873#0" expanded="true" />
+            <element signature="e#4955#4956#0" expanded="true" />
+            <element signature="e#4994#4995#0" expanded="true" />
+            <element signature="e#5058#5059#0" expanded="true" />
+            <element signature="e#5114#5115#0" expanded="true" />
+            <element signature="e#5194#5195#0" expanded="true" />
+            <element signature="e#5233#5234#0" expanded="true" />
+            <element signature="e#5297#5298#0" expanded="true" />
+            <element signature="e#5353#5354#0" expanded="true" />
+            <element signature="e#5428#5429#0" expanded="true" />
+            <element signature="e#5462#5463#0" expanded="true" />
+            <element signature="e#5516#5517#0" expanded="true" />
+            <element signature="e#5562#5563#0" expanded="true" />
+            <element signature="e#5634#5635#0" expanded="true" />
+            <element signature="e#5670#5671#0" expanded="true" />
+            <element signature="e#5728#5729#0" expanded="true" />
+            <element signature="e#5778#5779#0" expanded="true" />
+            <element signature="e#5852#5853#0" expanded="true" />
+            <element signature="e#5888#5889#0" expanded="true" />
+            <element signature="e#5946#5947#0" expanded="true" />
+            <element signature="e#5996#5997#0" expanded="true" />
+            <element signature="e#6067#6068#0" expanded="true" />
+            <element signature="e#6100#6101#0" expanded="true" />
+            <element signature="e#6152#6153#0" expanded="true" />
+            <element signature="e#6196#6197#0" expanded="true" />
+            <element signature="e#6261#6262#0" expanded="true" />
+            <element signature="e#6291#6292#0" expanded="true" />
+            <element signature="e#6337#6338#0" expanded="true" />
+            <element signature="e#6375#6376#0" expanded="true" />
+            <element signature="e#6437#6438#0" expanded="true" />
+            <element signature="e#6467#6468#0" expanded="true" />
+            <element signature="e#6513#6514#0" expanded="true" />
+            <element signature="e#6551#6552#0" expanded="true" />
+            <element signature="e#6613#6614#0" expanded="true" />
+            <element signature="e#6643#6644#0" expanded="true" />
+            <element signature="e#6689#6690#0" expanded="true" />
+            <element signature="e#6727#6728#0" expanded="true" />
+            <element signature="e#6796#6797#0" expanded="true" />
+            <element signature="e#6829#6830#0" expanded="true" />
+            <element signature="e#6881#6882#0" expanded="true" />
+            <element signature="e#6925#6926#0" expanded="true" />
+            <element signature="e#6995#6996#0" expanded="true" />
+            <element signature="e#7030#7031#0" expanded="true" />
+            <element signature="e#7086#7087#0" expanded="true" />
+            <element signature="e#7134#7135#0" expanded="true" />
+            <element signature="e#7202#7203#0" expanded="true" />
+            <element signature="e#7233#7234#0" expanded="true" />
+            <element signature="e#7281#7282#0" expanded="true" />
+            <element signature="e#7321#7322#0" expanded="true" />
+            <element signature="e#7390#7391#0" expanded="true" />
+            <element signature="e#7426#7427#0" expanded="true" />
+            <element signature="e#7484#7485#0" expanded="true" />
+            <element signature="e#7534#7535#0" expanded="true" />
+            <element signature="e#7602#7603#0" expanded="true" />
+            <element signature="e#7636#7637#0" expanded="true" />
+            <element signature="e#7690#7691#0" expanded="true" />
+            <element signature="e#7736#7737#0" expanded="true" />
+            <element signature="e#7806#7807#0" expanded="true" />
+            <element signature="e#7840#7841#0" expanded="true" />
+            <element signature="e#7894#7895#0" expanded="true" />
+            <element signature="e#7940#7941#0" expanded="true" />
+            <element signature="e#8006#8007#0" expanded="true" />
+            <element signature="e#8036#8037#0" expanded="true" />
+            <element signature="e#8082#8083#0" expanded="true" />
+            <element signature="e#8120#8121#0" expanded="true" />
+            <element signature="e#8189#8190#0" expanded="true" />
+            <element signature="e#8226#8227#0" expanded="true" />
+            <element signature="e#8286#8287#0" expanded="true" />
+            <element signature="e#8338#8339#0" expanded="true" />
+            <element signature="e#8417#8418#0" expanded="true" />
+            <element signature="e#8457#8458#0" expanded="true" />
+            <element signature="e#8523#8524#0" expanded="true" />
+            <element signature="e#8581#8582#0" expanded="true" />
+            <element signature="e#8655#8656#0" expanded="true" />
+            <element signature="e#8687#8688#0" expanded="true" />
+            <element signature="e#8737#8738#0" expanded="true" />
+            <element signature="e#8779#8780#0" expanded="true" />
+            <element signature="e#8846#8847#0" expanded="true" />
+            <element signature="e#8879#8880#0" expanded="true" />
+            <element signature="e#8931#8932#0" expanded="true" />
+            <element signature="e#8975#8976#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#787#788#0" expanded="true" />
+            <element signature="e#817#818#0" expanded="true" />
+            <element signature="e#2105#2106#0" expanded="true" />
+            <element signature="e#2135#2136#0" expanded="true" />
+            <element signature="e#2431#2432#0" expanded="true" />
+            <element signature="e#2461#2462#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index 854f1f1..0db633a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -165,12 +165,16 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String startDay,String endDay) {
+    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew) {
         try {
 
             Criteria criteria = createCriteria(PgAlarm.class);
             criteria.addOrder(Order.desc("id"));
 
+            if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) {
+                criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
+            }
+
             if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay))
             {
                 criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay)));
@@ -193,9 +197,11 @@
 
                 criteria.add(Restrictions.le("alarmDate",date));
             }
+            if(StringUtils.isNotBlank(isNew)&&isNew.equals("true"))
+                criteria.add(Restrictions.eq("active", 1));
 
             List<PgAlarm> pgAlarmList = criteria.list();
-            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
     }
 
     //根据设备位置(仓位)获取摄像机列表
-    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+    public List<PgDeviceDto> getPgCameraListByPosition(String partition,String position){
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.like("position",position+"%"));
-//        criteria.add(Restrictions.eq("devType","球机"));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(position))
+            criteria.add(Restrictions.like("position",position+"%"));
+
         criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
 
         List<PgDevice> pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
             dto.setDevCode(objects[5].toString());
             dto.setDevType(objects[6].toString());
             if(objects[7]!=null)
-            dto.setIp(objects[7].toString());
+                dto.setIp(objects[7].toString());
             dto.setIsOpen(objects[8].toString());
             dto.setPartition(objects[11].toString());
             dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index 8ebf74d..3c657a7 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgEquipment;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
 import com.casic.PgInterface.devTable.dto.PgEquipmentDto;
@@ -34,9 +35,12 @@
     public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
-        criteria.add(Restrictions.eq("eqName",eqName));
-        criteria.add(Restrictions.eq("eqCode",eqCode));
-        criteria.add(Restrictions.eq("eqType",eqType));
+        if(StringUtils.isNotBlank(eqName))
+            criteria.add(Restrictions.eq("eqName",eqName));
+        if(StringUtils.isNotBlank(eqCode))
+            criteria.add(Restrictions.eq("eqCode",eqCode));
+        if(StringUtils.isNotBlank(eqType))
+            criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
@@ -51,10 +55,9 @@
 
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
-        //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
         String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
-        +eqType+"' group by equipment.EQ_NAME";
+                +eqType+"' group by equipment.EQ_NAME";
 
         List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4ed68e4..e413a5c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
@@ -39,7 +40,8 @@
 
     public List<PgPipeLineDto> getPipeLineByLineType(String lineType) {
         Criteria criteria = createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineType", lineType));
+        if(StringUtils.isNotBlank(lineType))
+            criteria.add(Restrictions.eq("lineType", lineType));
 
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    private Long id;
-    private String keyId;//巡检记录单id
-    private String planId;//巡检计划ID
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    @Column(name="KEY_ID")
-    public String getKeyId() {
-        return keyId;
-    }
-
-    public void setKeyId(String keyId) {
-        this.keyId = keyId;
-    }
-
-    @Column(name="PLAN_ID")
-    public String getPlanId() {
-        return planId;
-    }
-
-    public void setPlanId(String planId) {
-        this.planId = planId;
-    }
-
-    @Column(name="CREATE_DATE")
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    @Column(name="STATE")
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    @Column(name="CREATOR")
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    @Column(name="PLAN_NAME")
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    @Column(name="RECORD_NO")
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    @Column(name="PLAN_NO")
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    @Column(name="RESPONSIBIE_DEPT")
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    @Column(name="INSPECTION_PERSON")
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    @Column(name="PATROL_MAN")
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    @Column(name="OPERATE_DATE")
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    @Column(name="REMARK")
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Column(name="BUILD_CABIN")
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    @Column(name="PROJECT")
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    @Column(name="START_PILE_NO")
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    @Column(name="END_PILE_NO")
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    @Column(name="INSPECTION_PRACE")
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    @Column(name="OTHER_PATROL_MAN")
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private Long id;
+    private String KEY_ID;//唯一键值
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_PERSON;//巡检人
+    private String START_DATE;//巡检开始时间
+    private String END_DATE;
+    private String FREQUENCY;//巡检频率
+    private String STATE;//状态
+    private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+    private String PLAN_NO;//巡检计划编号
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_MODE;//巡检方式
+    private String INSPECTION_ROUTE;//巡检路线
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String INSPECTION_GROUP;//巡检部门
+    private String INSERT_TIME;//插入时间
+    private String FREQUENCYDATE;//巡检具体日期
+    private String FREQUENCYTIME;//巡检具体时间
+    private String CREATEDATE;//创建时间
+    private String CREATOR;//创建人
+    private String PROJECT;//项目
+    private String COMLILE;//编制人
+    private String START_TIME;//编制时间
+    private String DEVELOP_DEPT;//制定部门
+    private String END_TIME;//结束时间
+    private String START_PILE_NO;//开始桩号
+    private String END_PILE_NO;//结束桩号
+    private String BUILD_CABIN;//巡检舱室
+    private String MILEAGE;
+    private String FREQUENCY_TIME;//巡检具体时间
+    private String FREQUENCYTIME_END;
+    private String KETTLE_TS;
+    private String UPDATEDATE;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="KEY_ID")
+    public String getKEY_ID() {
+        return KEY_ID;
+    }
+
+    public void setKEY_ID(String KEY_ID) {
+        this.KEY_ID = KEY_ID;
+    }
+
+    @Column(name="PLAN_NAME")
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    @Column(name="INSPECTION_PERSON")
+    public String getINSPECTION_PERSON() {
+        return INSPECTION_PERSON;
+    }
+
+    public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+        this.INSPECTION_PERSON = INSPECTION_PERSON;
+    }
+
+    @Column(name="START_DATE")
+    public String getSTART_DATE() {
+        return START_DATE;
+    }
+
+    public void setSTART_DATE(String START_DATE) {
+        this.START_DATE = START_DATE;
+    }
+
+    @Column(name="END_DATE")
+    public String getEND_DATE() {
+        return END_DATE;
+    }
+
+    public void setEND_DATE(String END_DATE) {
+        this.END_DATE = END_DATE;
+    }
+
+    @Column(name="FREQUENCY")
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    @Column(name="STATE")
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    @Column(name="RESPONSIBLE_DEPT")
+    public String getRESPONSIBLE_DEPT() {
+        return RESPONSIBLE_DEPT;
+    }
+
+    public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+        this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+    }
+
+    @Column(name="PLAN_NO")
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    @Column(name="INSPECTION_TYPE")
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    @Column(name="INSPECTION_MODE")
+    public String getINSPECTION_MODE() {
+        return INSPECTION_MODE;
+    }
+
+    public void setINSPECTION_MODE(String INSPECTION_MODE) {
+        this.INSPECTION_MODE = INSPECTION_MODE;
+    }
+
+    @Column(name="INSPECTION_ROUTE")
+    public String getINSPECTION_ROUTE() {
+        return INSPECTION_ROUTE;
+    }
+
+    public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+        this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+    }
+
+    @Column(name="INSPECTION_START_TIME")
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    @Column(name="INSPECTION_END_TIME")
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    @Column(name="INSPECTION_PRACE")
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    @Column(name="INSPECTION_GROUP")
+    public String getINSPECTION_GROUP() {
+        return INSPECTION_GROUP;
+    }
+
+    public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+        this.INSPECTION_GROUP = INSPECTION_GROUP;
+    }
+
+    @Column(name="INSERT_TIME")
+    public String getINSERT_TIME() {
+        return INSERT_TIME;
+    }
+
+    public void setINSERT_TIME(String INSERT_TIME) {
+        this.INSERT_TIME = INSERT_TIME;
+    }
+
+    @Column(name="FREQUENCYDATE")
+    public String getFREQUENCYDATE() {
+        return FREQUENCYDATE;
+    }
+
+    public void setFREQUENCYDATE(String FREQUENCYDATE) {
+        this.FREQUENCYDATE = FREQUENCYDATE;
+    }
+
+    @Column(name="FREQUENCYTIME")
+    public String getFREQUENCYTIME() {
+        return FREQUENCYTIME;
+    }
+
+    public void setFREQUENCYTIME(String FREQUENCYTIME) {
+        this.FREQUENCYTIME = FREQUENCYTIME;
+    }
+
+    @Column(name="CREATEDATE")
+    public String getCREATEDATE() {
+        return CREATEDATE;
+    }
+
+    public void setCREATEDATE(String CREATEDATE) {
+        this.CREATEDATE = CREATEDATE;
+    }
+
+    @Column(name="CREATOR")
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    @Column(name="PROJECT")
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    @Column(name="COMLILE")
+    public String getCOMLILE() {
+        return COMLILE;
+    }
+
+    public void setCOMLILE(String COMLILE) {
+        this.COMLILE = COMLILE;
+    }
+
+    @Column(name="START_TIME")
+    public String getSTART_TIME() {
+        return START_TIME;
+    }
+
+    public void setSTART_TIME(String START_TIME) {
+        this.START_TIME = START_TIME;
+    }
+
+    @Column(name="DEVELOP_DEPT")
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    @Column(name="END_TIME")
+    public String getEND_TIME() {
+        return END_TIME;
+    }
+
+    public void setEND_TIME(String END_TIME) {
+        this.END_TIME = END_TIME;
+    }
+
+    @Column(name="START_PILE_NO")
+    public String getSTART_PILE_NO() {
+        return START_PILE_NO;
+    }
+
+    public void setSTART_PILE_NO(String START_PILE_NO) {
+        this.START_PILE_NO = START_PILE_NO;
+    }
+
+    @Column(name="END_PILE_NO")
+    public String getEND_PILE_NO() {
+        return END_PILE_NO;
+    }
+
+    public void setEND_PILE_NO(String END_PILE_NO) {
+        this.END_PILE_NO = END_PILE_NO;
+    }
+
+    @Column(name="BUILD_CABIN")
+    public String getBUILD_CABIN() {
+        return BUILD_CABIN;
+    }
+
+    public void setBUILD_CABIN(String BUILD_CABIN) {
+        this.BUILD_CABIN = BUILD_CABIN;
+    }
+
+    @Column(name="MILEAGE")
+    public String getMILEAGE() {
+        return MILEAGE;
+    }
+
+    public void setMILEAGE(String MILEAGE) {
+        this.MILEAGE = MILEAGE;
+    }
+
+    @Column(name="FREQUENCY_TIME")
+    public String getFREQUENCY_TIME() {
+        return FREQUENCY_TIME;
+    }
+
+    public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+        this.FREQUENCY_TIME = FREQUENCY_TIME;
+    }
+
+    @Column(name="FREQUENCYTIME_END")
+    public String getFREQUENCYTIME_END() {
+        return FREQUENCYTIME_END;
+    }
+
+    public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+        this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+    }
+
+    @Column(name="KETTLE_TS")
+    public String getKETTLE_TS() {
+        return KETTLE_TS;
+    }
+
+    public void setKETTLE_TS(String KETTLE_TS) {
+        this.KETTLE_TS = KETTLE_TS;
+    }
+
+    @Column(name="UPDATEDATE")
+    public String getUPDATEDATE() {
+        return UPDATEDATE;
+    }
+
+    public void setUPDATEDATE(String UPDATEDATE) {
+        this.UPDATEDATE = UPDATEDATE;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 5346b57..2f8d359 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -66,7 +66,7 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REPAIRMAN")
+    @Column(name="REOAIRMAN")
     public String getRepairMan() {
         return repairMan;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
-    private Long id;
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-
-
-    public static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
-        PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
-        pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
-        pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
-        pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
-        pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
-        pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
-        pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
-        pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
-        pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
-        pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
-        pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
-        pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
-        pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
-        pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
-        pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
-        return pgAssetInSpectionRecordDto;
-    }
-
-
-    public static List<PgAssetInSpectionRecordDto> ConvertToDtoList(List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList){
-        List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-        for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
-            pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
-        }
-
-        return pgAssetInSpectionRecordDtoList;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
-    private String num;
-    private String createDate;
-
-    public String getNum() {
-        return num;
-    }
-
-    public void setNum(String num) {
-        this.num = num;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+    private Long id;
+    private String PLAN_NO;//巡检计划编号
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String FREQUENCY;//巡检频率
+    private String CREATOR;//创建人
+    private String DEVELOP_DEPT;//制定部门
+    private String PROJECT;//项目
+    private String STATE;//状态
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+        PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+        pgAssetPlanDto.setId(pgAssetPlan.getId());
+        pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+        pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+        pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+        pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+        pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+        pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+        pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+        pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+        pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+        pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+        pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+        return pgAssetPlanDto;
+    }
+
+    public static List<PgAssetPlanDto> ConvertToPgAssetDtoList(List<PgAssetPlan> pgAssetPlanList){
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
+
+        for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+            pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+        }
+
+        return pgAssetPlanDtoList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
new file mode 100644
index 0000000..bc12db1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
@@ -0,0 +1,24 @@
+package com.casic.PgInterface.maintenance.dto;
+
+public class PgAssetPlanStatic {
+
+    private String num;
+    private String createDate;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
deleted file mode 100644
index c41ca7d..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.casic.PgInterface.maintenance.manager;
-
-import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
-
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
-        try {
-            String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
-                    "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
-                    "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-
-            if(patrolMan!=null)
-                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
-            if(startTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
-            if(endTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')<to_date('"+endTime+"','yyyy-MM-dd')";
-
-            sql+=" order by id";
-
-            List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
-
-            List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList=new ArrayList<>();
-            for(Object[] objects1:objects){
-                PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord();
-
-                pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString()));
-                pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1]));
-                pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2]));
-                pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3]));
-                pgAssetInSpectionRecord.setState(String.valueOf(objects1[4]));
-                pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5]));
-                pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6]));
-                pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7]));
-                pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8]));
-                pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9]));
-                pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10]));
-                pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11]));
-                pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12]));
-                pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13]));
-                pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14]));
-                pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15]));
-                pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16]));
-                pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17]));
-                pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18]));
-                pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19]));
-
-                pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord);
-            }
-
-            List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-            for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList)
-            {
-                pgAssetInSpectionRecordDtoList.add(PgAssetInSpectionRecordDto.ConvertToDto(pgAssetInSpectionRecord));
-            }
-
-            return pgAssetInSpectionRecordDtoList;
-        }
-        catch(Exception e)
-        {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public List<PgAssetInSpectionRecordStatic> getPgAssetInSpectionRecordStaticLisByTime(
-            String startTime, String endTime, String staticType) {
-
-        String sql="";
-        String dateType="";
-        List<PgAssetInSpectionRecordStatic> pgAssetInSpectionRecordStaticList=new ArrayList<>();
-        int type=Integer.valueOf(staticType);
-
-        switch(type) {
-            case 0://年
-                dateType = "yyyy";
-                break;
-            case 1://月
-                dateType = "yyyy-mm";
-                break;
-            case 2://周
-                dateType = "iw";
-                break;
-            case 3://日
-                dateType="yyyy-mm-dd";
-                break;
-            default:
-                break;
-        }
-
-        sql="select count(*), to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_RECORD t where 1=1";
-
-        if(startTime!=null)
-            sql+=" and t.CREATE_DATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
-        if(endTime!=null)
-            sql+=" and t.CREATE_DATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
-
-        sql+=" group by to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"')";
-
-        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
-        for(int i=0;i<objects.size();i++)
-        {
-            PgAssetInSpectionRecordStatic pgAssetInSpectionRecordStatic=new PgAssetInSpectionRecordStatic();
-            pgAssetInSpectionRecordStatic.setNum(objects.get(i)[0].toString());
-            pgAssetInSpectionRecordStatic.setCreateDate(objects.get(i)[1].toString());
-            pgAssetInSpectionRecordStaticList.add(pgAssetInSpectionRecordStatic);
-        }
-        return pgAssetInSpectionRecordStaticList;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
new file mode 100644
index 0000000..bb6bf1e
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
@@ -0,0 +1,81 @@
+package com.casic.PgInterface.maintenance.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgAssetPlanManager extends HibernateEntityDao<PgAssetPlan> {
+
+    public List<PgAssetPlanDto> getPgAssetPlanDtoList(String inSpectionPlace){
+        Criteria criteria=createCriteria(PgAssetPlan.class);
+
+        if(StringUtils.isNotBlank(inSpectionPlace))
+            criteria.add(Restrictions.like("INSPECTION_PRACE","%"+inSpectionPlace+"%"));
+        criteria.addOrder(Order.desc("id"));
+
+        List<PgAssetPlan> pgAssetPlanList=criteria.list();
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=PgAssetPlanDto.ConvertToPgAssetDtoList(pgAssetPlanList);
+
+        if(pgAssetPlanDtoList==null||pgAssetPlanDtoList.size()==0)
+            return null;
+        else
+            return pgAssetPlanDtoList;
+    }
+
+    public List<PgAssetPlanStatic> getPgAssetPlanStaticLisByTime(
+            String startTime, String endTime, String staticType) {
+
+        String sql="";
+        String dateType="";
+        List<PgAssetPlanStatic> pgAssetPlanStaticList=new ArrayList<>();
+        int type=Integer.valueOf(staticType);
+
+        switch(type) {
+            case 0://年
+                dateType = "yyyy";
+                break;
+            case 1://月
+                dateType = "yyyy-mm";
+                break;
+            case 2://周
+                dateType = "iw";
+                break;
+            case 3://日
+                dateType="yyyy-mm-dd";
+                break;
+            default:
+                break;
+        }
+
+        sql="select count(*), to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_PLAN t where 1=1";
+
+        if(startTime!=null)
+            sql+=" and t.CREATEDATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
+        if(endTime!=null)
+            sql+=" and t.CREATEDATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
+
+        sql+=" group by to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"')";
+
+        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
+        for(int i=0;i<objects.size();i++)
+        {
+            PgAssetPlanStatic pgAssetPlanStatic=new PgAssetPlanStatic();
+            pgAssetPlanStatic.setNum(objects.get(i)[0].toString());
+            pgAssetPlanStatic.setCreateDate(objects.get(i)[1].toString());
+            pgAssetPlanStaticList.add(pgAssetPlanStatic);
+        }
+        return pgAssetPlanStaticList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 0903f22..3484739 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -15,7 +15,7 @@
 
     public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
             if(repairMan!=null)
                 sql+=" and REPAIRMAN like '%"+repairMan+"%'";
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index 9cc2881..6d90d7b 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -1,5 +1,7 @@
 package com.casic.PgInterface.patroler.dto;
 
+import com.casic.PgInterface.devTable.domain.PgDevice;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 
 /**
@@ -14,6 +16,7 @@
     private String unit;//单位
     private String alarmType;//报警类型
     private Long pgDeviceId;//设备编号
+    private String assetCode;//资产编号
 
     public Long getId() {
         return id;
@@ -71,7 +74,15 @@
         this.pgDeviceId = pgDeviceId;
     }
 
-    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
+    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule, PgDeviceManager pgDeviceManager) {
         this.setId(pgAlarmRule.getId());
         this.setHighValue(pgAlarmRule.getHighValue());
         this.setLowValue(pgAlarmRule.getLowValue());
@@ -82,6 +93,10 @@
         else
             this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
         this.setPgDeviceId(pgAlarmRule.getPgDeviceId());
+        if(pgAlarmRule.getAlarmTypeId()!=null&&pgDeviceManager.get(pgAlarmRule.getPgDeviceId())!=null)
+            this.setAssetCode(pgDeviceManager.get(pgAlarmRule.getPgDeviceId()).getAssetCode());
+        else
+            this.setAssetCode("");
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
index c132c98..a7cef5b 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
@@ -1,13 +1,17 @@
 package com.casic.PgInterface.patroler.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.ResponseStatus;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -17,30 +21,23 @@
 @Service
 public class PgAlarmRuleManager extends HibernateEntityDao<PgAlarmRule> {
 
+    @Resource
+    private PgDeviceManager pgDeviceManager;
+
     //根据设备获取设备报警阈值
-    public List<PgAlarmRuleDto>  getAlarmRuleDto() {
+    public List<PgAlarmRuleDto>  getAlarmRuleDto(String devType) {
         Criteria criteria=createCriteria(PgAlarmRule.class);
+
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.eq("devType", devType));
         criteria.addOrder(Order.desc("id"));
 
         List<PgAlarmRule> pgAlarmRuleList=criteria.list();
-        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
+        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         for (PgAlarmRule pgAlarmRule : pgAlarmRuleList) {
-            pgAlarmRuleDtoList.add(new PgAlarmRuleDto(pgAlarmRule));
+            pgAlarmRuleDtoList.add(new PgAlarmRuleDto(pgAlarmRule,pgDeviceManager));
         }
         return pgAlarmRuleDtoList;
-
     }
 
-    public PgAlarmRule getAlarmRuleBydevType(String devType) {
-        Criteria criteria=createCriteria(PgAlarmRule.class);
-        criteria.add(Restrictions.eq("devType", devType));
-
-        List<PgAlarmRule> pgAlarmRuleList=criteria.list();
-
-        if(pgAlarmRuleList==null||pgAlarmRuleList.size()==0)
-            return null;
-        else
-            return pgAlarmRuleList.get(0);
-    }
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index d0e28f5..082ba5d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgAlarm;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
@@ -39,7 +40,7 @@
     private PgReservePlanManager pgReservePlanManager;
 
     /*
-    * 获取报警设备信息
+     * 获取报警设备信息
      */
     @POST
     @Path("linkDevice")
@@ -50,11 +51,22 @@
 
         PgDeviceDto pgDeviceDto = null;
         try {
-            PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
-            PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
-
-            pgDeviceDto=new PgDeviceDto(pgDevice);
-            msg = "报警关联设备获取成功";
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if (pgAlarm == null)
+                    msg = "不存在报警信息";
+                else {
+                    PgDevice pgDevice = pgAlarm.getAlarmDevId();
+                    if (pgDevice == null)
+                        msg = "不存在报警设备";
+                    else {
+                        pgDeviceDto = new PgDeviceDto(pgDevice);
+                        msg = "报警关联设备获取成功";
+                    }
+                }
+            }
+            else
+                msg="未接受到报警设备ID信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取关联设备失败";
@@ -77,11 +89,28 @@
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
-            PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
-            PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
-            pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if(pgAlarm==null)
+                    msg="不存在报警信息";
+                else {
+                    PgDevice pgDevice = pgAlarm.getAlarmDevId();
+                    if (pgDevice == null)
+                        msg = "不存在报警设备";
+                    else {
+                        String strPosition=pgDevice.getPosition();
+                        String position="";
+                        if(!strPosition.equals(""))
+                            position=pgDevice.getPosition().substring(0,3);
+                        String partition=pgDevice.getPartition();
 
-            msg = "关联设备获取成功";
+                        pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
+                        msg = "关联设备获取成功";
+                    }
+                }
+            }
+            else
+                msg="请输入报警设备Id信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "分区设备关联失败";
@@ -93,7 +122,7 @@
 
     /*
      * 根据报警记录获取关联的预案
-    */
+     */
     @POST
     @Path("linkReservePlan")
     @Produces(MediaType.APPLICATION_JSON)
@@ -103,10 +132,21 @@
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
-            PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
-            pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if (pgAlarm == null)
+                    msg = "不存在报警信息";
+                else {
+                    pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-            msg="关联预案获取成功";
+                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
+                        msg="不存在关联的报警预案";
+                    else
+                        msg = "关联预案获取成功";
+                }
+            }
+            else
+                msg="请输入报警信息";
         }
         catch(Exception e)
         {
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index d18ebb8..baacd93 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -48,14 +48,16 @@
     @POST
     @Path("getAlarmInfo")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmList(@FormParam("startDay") String startDay,
-                                            @FormParam("endDay") String endDay) throws Exception {
+    public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
+                                            @FormParam("startDay") String startDay,
+                                            @FormParam("endDay") String endDay,
+                                            @FormParam("isNew") String isNew) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(startDay,endDay);
-            if (pgAlarmDtoList.size() == 0)
+            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew);
+            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
                 msg = "没有报警信息";
             else
                 msg = "报警信息获取成功";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 87afd54..29ce8a4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -1,7 +1,5 @@
 package com.casic.PgInterface.rs;
 
-import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager;
-import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import com.casic.PgInterface.patroler.manager.PgAlarmRuleManager;
@@ -30,119 +28,23 @@
     private static Logger logger = LoggerFactory.getLogger(PgAlarmRule.class);
 
     @Resource
-    private PgDeviceManager pgDeviceManager;
-    @Resource
-    private PgAlarmTypeManager pgAlarmTypeManager;
-    @Resource
     private PgAlarmRuleManager pgAlarmRuleManager;
 
-
-
-    /**
-     * 新增报警阈值
-     */
-    @POST
-    @Path("addAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> addAlarmRule(@FormParam("highValue") String highValue,
-                                            @FormParam("lowValue") String lowValue,
-                                            @FormParam("unit") String unit,
-                                            @FormParam("devType") String devType,
-                                            @FormParam("alarmType") String alarmType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType);
-            if (pgAlarmRule != null) {
-                result = "false";
-                msg = "设备阈值已经存在";
-            } else {
-                pgAlarmRule = new PgAlarmRule();
-                pgAlarmRule.setHighValue(highValue);
-                pgAlarmRule.setLowValue(lowValue);
-                pgAlarmRule.setDevType(devType);
-                pgAlarmRule.setUnit(unit);
-                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
-
-                pgAlarmRuleManager.save(pgAlarmRule);
-                result = "true";
-                msg = "报警阈值新增成功";
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = "false";
-            msg = "报警阈值新增失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-        return resultMap;
-    }
-
-    /**
-     * 编辑报警阈值
-     */
-    @POST
-    @Path("editAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> editAlarmRule(@FormParam("id") String id,
-                                             @FormParam("devType") String devType,
-                                             @FormParam("highValue") String highValue,
-                                             @FormParam("lowValue") String lowValue,
-                                             @FormParam("unit") String unit,
-                                             @FormParam("alarmType") String alarmType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
-            if (pgAlarmRule == null) {
-                msg = "不存在报警阈值记录";
-                result = "false";
-            } else {
-                pgAlarmRule.setDevType(devType);
-                pgAlarmRule.setHighValue(highValue);
-                pgAlarmRule.setLowValue(lowValue);
-                pgAlarmRule.setUnit(unit);
-                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
-
-                pgAlarmRuleManager.save(pgAlarmRule);
-                msg = "编辑成功";
-                result = "true";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            result = "false";
-            msg = "报警阈值编辑失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-
-        return resultMap;
-    }
-
     /**
      * 获取报警阈值信息
      */
     @POST
     @Path("getAlarmRule")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmRule() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+    public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
+        System.out.println("devType:"+devType);
+        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
-            pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto();
-            if (pgAlarmRuleDtoList == null)
+            pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
+            if (pgAlarmRuleDtoList == null||pgAlarmRuleDtoList.size()==0)
                 msg = "不存在报警阈值信息";
             else
                 msg = "报警阈值获取成功";
@@ -155,69 +57,4 @@
         return resultMap;
     }
 
-    /**
-     * 删除报警阈值
-     */
-    @POST
-    @Path("deleteAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> deleteAlarmRule(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
-            if (pgAlarmRule == null) {
-                msg = "不存在报警阈值记录";
-                result = "false";
-            } else {
-                pgAlarmRuleManager.remove(pgAlarmRule);
-                msg = "删除成功";
-                result = "true";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            result = "false";
-            msg = "报警阈值删除失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-
-        return resultMap;
-    }
-
-    /**
-     * 根据设备类型报警阈值
-     */
-    @POST
-    @Path("getAlarmRuleByDevType")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmRuleByDevType(@FormParam("devType") String devType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        PgAlarmRule pgAlarmRule = null;
-        List<PgAlarmRuleDto> pgAlarmRuleDtos = new ArrayList<>();
-        try {
-            pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType);
-            if (pgAlarmRule == null)
-                msg = "不存在报警阈值记录";
-            else {
-                PgAlarmRuleDto pgAlarmRuleDto= new PgAlarmRuleDto(pgAlarmRule);
-                pgAlarmRuleDtos.add(pgAlarmRuleDto);
-                msg = "报警阈值获取成功";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            msg = "报警阈值获取失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmRuleDtos);
-
-        return resultMap;
-    }
-
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
new file mode 100644
index 0000000..19d3b8c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanRs")
+public class PgAssetPlanRs {
+
+    @Resource
+    private PgAssetPlanManager pgAssetPlanManager;
+
+    /**
+     * 获取巡检记录
+     */
+    @POST
+    @Path("getPgAssetPlanList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPgAssetPlanList(@FormParam("inSpectionPlace") String inSpectionPlace){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
+        try{
+            pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(inSpectionPlace);
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
+                msg="巡检信息获取成功";
+            else
+                msg="不存在巡检信息";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="巡检信息获取失败";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAssetPlanDtoList);
+
+        return resultMap;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
new file mode 100644
index 0000000..47ef9d1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanStaticRs")
+public class PgAssetPlanStaticRs {
+
+    @Resource
+    private PgAssetPlanManager pgAssetPlanManager;
+
+    @POST
+    @Path("getPgAssetPlanStaticList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPgAssetPlanStaticList(@FormParam("startTime") String startTime,
+                                                       @FormParam("endTime") String endTime,
+                                                       @FormParam("staticType") String staticType) throws Exception{
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
+        try{
+            pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
+                msg="巡检统计信息获取成功";
+            else
+                msg="统计信息获取失败";
+        }
+        catch (Exception ex){
+            ex.printStackTrace();
+            msg="统计失败";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAssetPlanStaticList);
+
+        return resultMap;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
deleted file mode 100644
index 66f4d09..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.manager.PgAssetInSpectionRecordManager;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@Path("pgAssetRecordRs")
-public class PgAssetRecordRs {
-
-    @Resource
-    private PgAssetInSpectionRecordManager pgAssetInSpectionRecordManager;
-
-    /**
-     * 获取巡检记录
-     */
-    @POST
-    @Path("getPgAssetRecordList")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgAssetRecordList(@FormParam("patrolMan") String patrolMan,
-                                                   @FormParam("startTime") String startTime,
-                                                   @FormParam("endTime") String endTime){
-        Map<String,Object> resultMap=new HashMap<>();
-        String msg="";
-
-        List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-        try{
-            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(patrolMan,startTime,endTime);
-            if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0)
-                msg="巡检信息获取成功";
-            else
-                msg="不存在巡检信息";
-        }
-        catch(Exception ex){
-            ex.printStackTrace();
-            msg="巡检信息获取失败";
-        }
-
-        resultMap.put("msg",msg);
-        resultMap.put("result",pgAssetInSpectionRecordDtoList);
-
-        return resultMap;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java
deleted file mode 100644
index 5f0417a..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import com.casic.PgInterface.maintenance.manager.PgAssetInSpectionRecordManager;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@Path("pgAssetRecordStaticRs")
-public class PgAssetRecordStaticRs {
-
-    @Resource
-    private PgAssetInSpectionRecordManager pgAssetInSpectionRecordManager;
-
-    @POST
-    @Path("getPgAssetRecordHeadStaticList")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgAssetRecordHeadStaticList(@FormParam("startTime") String startTime,
-                                                                @FormParam("endTime") String endTime,
-                                                                @FormParam("staticType") String staticType) throws Exception{
-        Map<String,Object> resultMap=new HashMap<>();
-        String msg="";
-        String result="";
-
-        List<PgAssetInSpectionRecordStatic> pgAssetInSpectionRecordStaticList = null;
-        try{
-            pgAssetInSpectionRecordStaticList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetInSpectionRecordStaticList!=null&&pgAssetInSpectionRecordStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
-            else
-                msg="统计信息获取失败";
-        }
-        catch (Exception ex){
-            ex.printStackTrace();
-            msg="统计失败";
-        }
-
-        resultMap.put("msg",msg);
-        resultMap.put("result",pgAssetInSpectionRecordStaticList);
-
-        return resultMap;
-    }
-
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index 9dfdd88..a0245ba 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -326,7 +326,7 @@
 
             PgConstruction pgConstruction=pgConstructionManager.get(Long.valueOf(id));
 
-            pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(pgConstruction.getPgName());
+            pgDeviceDtoList=pgDeviceManager.getPgCameraListByPartition(pgConstruction.getPgName());
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index 1c8130c..c276fb3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -177,6 +177,7 @@
             else
             {
                 pgEquipment.setActive(0);
+                pgEquipmentManager.save(pgEquipment);
                 msg="删除成功";
                 result="true";
             }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index 486b49f..f0b936c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -287,7 +287,7 @@
         try {
             if (apCode != "") {
                 String apCodeStr=apCode.substring(0,3);
-                pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(apCodeStr);
+                pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition("",apCodeStr);
                 if(pgDeviceDtoList==null)
                     msg="不存在关联摄像机";
                 else

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ff69e2a..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,27 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190828.docx" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -32,72 +42,119 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="2" />
-          <entry key="java" value="243" />
-          <entry key="properties" value="6" />
+          <entry key="java" value="321" />
+          <entry key="properties" value="8" />
           <entry key="xml" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
-          <entry key="JAVA" value="243" />
-          <entry key="Properties" value="6" />
+          <entry key="JAVA" value="321" />
+          <entry key="Properties" value="8" />
           <entry key="XML" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="8082" />
-          <entry key="properties" value="49" />
-          <entry key="txt" value="64" />
+          <entry key="dummy" value="16" />
+          <entry key="java" value="10723" />
+          <entry key="properties" value="59" />
+          <entry key="txt" value="118" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="8082" />
-          <entry key="PLAIN_TEXT" value="64" />
-          <entry key="Properties" value="49" />
+          <entry key="JAVA" value="10723" />
+          <entry key="PLAIN_TEXT" value="134" />
+          <entry key="Properties" value="59" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="4" />
+          <entry key="project.closed" value="28" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
           <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.24" value="1" />
+          <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="1" />
-          <entry key="project.open.time.3" value="3" />
-          <entry key="project.open.time.31" value="1" />
+          <entry key="project.open.time.28" value="1" />
+          <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.31" value="2" />
           <entry key="project.open.time.37" value="1" />
+          <entry key="project.open.time.39" value="2" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.40" value="1" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="1" />
+          <entry key="project.open.time.44" value="2" />
           <entry key="project.open.time.45" value="2" />
           <entry key="project.open.time.48" value="1" />
           <entry key="project.open.time.49" value="1" />
+          <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.58" value="1" />
           <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.71" value="1" />
+          <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.71" value="2" />
           <entry key="project.open.time.76" value="1" />
-          <entry key="project.opened" value="25" />
+          <entry key="project.opened" value="41" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+            <state relative-caret-position="174">
+              <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
               <folding>
-                <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-                <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="352">
+              <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#787#788#0" expanded="true" />
+                <element signature="e#817#818#0" expanded="true" />
+                <element signature="e#2105#2106#0" expanded="true" />
+                <element signature="e#2135#2136#0" expanded="true" />
+                <element signature="e#2431#2432#0" expanded="true" />
+                <element signature="e#2461#2462#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="638">
+              <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+              <folding>
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -122,6 +179,7 @@
       <find>getPgDeviceByDevType</find>
       <find>message</find>
       <find>getConstructionByType</find>
+      <find>getPgCameraListByPosition</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -130,24 +188,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanTypeDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
@@ -162,17 +207,38 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
       </list>
     </option>
   </component>
@@ -208,16 +274,18 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="3" />
-    <option name="y" value="10" />
-    <option name="width" value="1386" />
-    <option name="height" value="788" />
+    <option name="x" value="1410" />
+    <option name="y" value="117" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -258,7 +326,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -267,16 +335,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -286,7 +345,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="dto" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -296,7 +355,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="manager" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -308,19 +367,10 @@
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="webapp" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -359,6 +409,7 @@
       </deployment>
       <server-settings>
         <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_7" />
+        <option name="JNDI_PORT" value="10991" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -456,7 +507,23 @@
       <workItem from="1566350810712" duration="6803000" />
       <workItem from="1566435787074" duration="10717000" />
       <workItem from="1566521753529" duration="14265000" />
-      <workItem from="1566614176989" duration="5693000" />
+      <workItem from="1566614176989" duration="14059000" />
+      <workItem from="1566780822009" duration="1026000" />
+      <workItem from="1566891563975" duration="284000" />
+      <workItem from="1566893107340" duration="3382000" />
+      <workItem from="1566953794976" duration="11039000" />
+      <workItem from="1567059357700" duration="484000" />
+      <workItem from="1567082835097" duration="1086000" />
+      <workItem from="1567126428020" duration="1539000" />
+      <workItem from="1567129277820" duration="5788000" />
+      <workItem from="1567136008996" duration="2568000" />
+      <workItem from="1567237040302" duration="111000" />
+      <workItem from="1567495626345" duration="2797000" />
+      <workItem from="1567558770152" duration="2352000" />
+      <workItem from="1567577368149" duration="640000" />
+      <workItem from="1567751224608" duration="780000" />
+      <workItem from="1568019299799" duration="695000" />
+      <workItem from="1568082566133" duration="4016000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -493,17 +560,60 @@
       <option name="project" value="LOCAL" />
       <updated>1566553388171</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="整理管线部分">
+      <created>1566620046627</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1566620046627</updated>
+    </task>
+    <task id="LOCAL-00007" summary="合并代码提交">
+      <created>1566781001910</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1566781001910</updated>
+    </task>
+    <task id="LOCAL-00008" summary="合并代码提交">
+      <created>1566963831930</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1566963831930</updated>
+    </task>
+    <task id="LOCAL-00009" summary="修改报警阈值">
+      <created>1566972146710</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1566972146710</updated>
+    </task>
+    <task id="LOCAL-00010" summary="修改巡检维护表字段">
+      <created>1567126525554</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1567126525554</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="142930000" />
+    <option name="totallyTimeSpent" value="189883000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
+    <frame x="1358" y="-8" width="1456" height="916" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29297996" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -511,13 +621,14 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Thumbnails" weight="0.3295082" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.5081967" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.3849105" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
       <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
       <window_info anchor="bottom" id="Spring" order="8" />
       <window_info anchor="bottom" id="Terminal" order="9" />
@@ -539,7 +650,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2193646" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -547,22 +658,23 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.47540984" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
-      <window_info anchor="bottom" id="Spring" order="8" />
-      <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
-      <window_info anchor="bottom" id="Statistic" order="11" />
-      <window_info anchor="bottom" id="Java Enterprise" order="12" />
-      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="14" weight="0.32786885" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.52307695" />
+      <window_info anchor="bottom" id="Thumbnails" order="0" weight="0.3295082" />
+      <window_info anchor="bottom" id="Message" order="1" />
+      <window_info anchor="bottom" id="Find" order="2" />
+      <window_info anchor="bottom" id="Run" order="3" />
+      <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.49924356" weight="0.49344262" />
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Application Servers" order="8" weight="0.3276923" />
+      <window_info anchor="bottom" id="Spring" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
+      <window_info anchor="bottom" id="Statistic" order="12" />
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <window_info anchor="bottom" id="Database Changes" order="14" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="15" weight="0.32786885" />
+      <window_info anchor="bottom" id="Messages" order="16" weight="0.5229508" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -578,6 +690,16 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -587,7 +709,11 @@
     <MESSAGE value="修改权限问题" />
     <MESSAGE value="修改人员登录返回接口" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整理管线部分" />
+    <MESSAGE value="合并代码提交" />
+    <MESSAGE value="修改报警阈值" />
+    <MESSAGE value="修改巡检维护表字段" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护表字段" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -602,322 +728,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-532">
-          <caret line="50" column="28" lean-forward="true" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="19" column="60" selection-start-line="19" selection-start-column="60" selection-end-line="19" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="100" column="34" lean-forward="true" selection-start-line="100" selection-start-column="34" selection-end-line="100" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1474">
-          <caret line="84" column="58" selection-start-line="84" selection-start-column="58" selection-end-line="84" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1100">
-          <caret line="58" column="18" selection-start-line="58" selection-start-column="18" selection-end-line="58" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6842">
-          <caret line="329" selection-start-line="329" selection-end-line="329" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="102" column="24" lean-forward="true" selection-start-line="102" selection-start-column="24" selection-end-line="102" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="72" column="56" lean-forward="true" selection-start-line="72" selection-start-column="56" selection-end-line="72" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="90" column="39" lean-forward="true" selection-start-line="90" selection-start-column="39" selection-end-line="90" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="97" column="16" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
-          <caret line="14" column="52" lean-forward="true" selection-start-line="14" selection-start-column="52" selection-end-line="14" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="26" column="34" lean-forward="true" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="61" column="1" lean-forward="true" selection-start-line="61" selection-start-column="1" selection-end-line="61" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="208" column="49" lean-forward="true" selection-start-line="208" selection-start-column="49" selection-end-line="208" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="140" column="57" selection-start-line="140" selection-start-column="57" selection-end-line="140" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="111" column="36" selection-start-line="111" selection-start-column="36" selection-end-line="111" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="3" lean-forward="true" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="81" column="58" lean-forward="true" selection-start-line="81" selection-start-column="58" selection-end-line="81" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="472">
-          <caret line="118" column="59" selection-start-line="118" selection-start-column="59" selection-end-line="118" selection-end-column="59" />
-          <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-198">
-          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="69" column="32" lean-forward="true" selection-start-line="69" selection-start-column="32" selection-end-line="70" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="142" column="59" lean-forward="true" selection-start-line="142" selection-start-column="59" selection-end-line="142" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="349" column="9" lean-forward="true" selection-start-line="349" selection-start-column="9" selection-end-line="349" selection-end-column="9" />
-          <folding>
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="e#12105#12121#0" expanded="true" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-686">
-          <caret line="67" column="31" lean-forward="true" selection-start-line="67" selection-start-column="31" selection-end-line="67" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="93" column="24" lean-forward="true" selection-start-line="93" selection-start-column="24" selection-end-line="93" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="57" column="23" lean-forward="true" selection-start-line="57" selection-start-column="23" selection-end-line="57" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-408">
-          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="98" column="40" lean-forward="true" selection-start-line="98" selection-start-column="40" selection-end-line="98" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="572">
@@ -925,13 +735,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="328" column="32" lean-forward="true" selection-start-line="328" selection-start-column="32" selection-end-line="328" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
@@ -950,16 +753,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="396">
           <caret line="23" column="32" lean-forward="true" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
-          <folding>
-            <element signature="e#2635#2636#0" expanded="true" />
-            <element signature="e#2671#2672#0" expanded="true" />
-            <element signature="e#2727#2728#0" expanded="true" />
-            <element signature="e#2777#2778#0" expanded="true" />
-            <element signature="e#2877#2878#0" expanded="true" />
-            <element signature="e#2911#2912#0" expanded="true" />
-            <element signature="e#2963#2964#0" expanded="true" />
-            <element signature="e#3009#3010#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -972,14 +765,481 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+        <state relative-caret-position="66">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="59" column="46" lean-forward="true" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3586">
+          <caret line="179" column="16" selection-start-line="179" selection-start-column="16" selection-end-line="179" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5478">
+          <caret line="273" column="3" selection-start-line="273" selection-start-column="3" selection-end-line="273" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1870">
+          <caret line="147" column="11" selection-start-line="147" selection-start-column="11" selection-end-line="147" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="55" column="15" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="106">
+          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="290" column="41" lean-forward="true" selection-start-line="290" selection-start-column="41" selection-end-line="290" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="21" column="32" lean-forward="true" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="550">
+          <caret line="38" column="89" selection-start-line="38" selection-start-column="89" selection-end-line="38" selection-end-column="89" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="11" column="28" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1166">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="818">
+          <caret line="285" column="13" lean-forward="true" selection-start-line="285" selection-start-column="13" selection-end-line="285" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="129" column="31" lean-forward="true" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="323" column="72" lean-forward="true" selection-start-line="323" selection-start-column="72" selection-end-line="323" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="44" column="13" lean-forward="true" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-638">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="244">
+          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="157">
+          <caret line="16" column="55" lean-forward="true" selection-start-line="16" selection-start-column="55" selection-end-line="16" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="270" column="33" lean-forward="true" selection-start-line="270" selection-start-column="33" selection-end-line="270" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="490">
+          <caret line="141" selection-start-line="141" selection-end-line="141" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="164" column="5" lean-forward="true" selection-start-line="164" selection-start-column="5" selection-end-line="164" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/apiTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-242">
+          <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="61" column="16" lean-forward="true" selection-start-line="61" selection-start-column="16" selection-end-line="61" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="700">
+          <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="12" column="34" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="39" column="9" lean-forward="true" selection-start-line="39" selection-start-column="9" selection-end-line="39" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="32" column="29" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="29" />
           <folding>
-            <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-            <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#1838#1839#0" expanded="true" />
+            <element signature="e#1863#1864#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1925#1926#0" expanded="true" />
+            <element signature="e#1822#1823#0" expanded="true" />
+            <element signature="e#1851#1852#0" expanded="true" />
+            <element signature="e#1895#1896#0" expanded="true" />
+            <element signature="e#1931#1932#0" expanded="true" />
+            <element signature="e#2132#2133#0" expanded="true" />
+            <element signature="e#2164#2165#0" expanded="true" />
+            <element signature="e#2214#2215#0" expanded="true" />
+            <element signature="e#2256#2257#0" expanded="true" />
+            <element signature="e#2330#2331#0" expanded="true" />
+            <element signature="e#2370#2371#0" expanded="true" />
+            <element signature="e#2436#2437#0" expanded="true" />
+            <element signature="e#2494#2495#0" expanded="true" />
+            <element signature="e#2569#2570#0" expanded="true" />
+            <element signature="e#2602#2603#0" expanded="true" />
+            <element signature="e#2654#2655#0" expanded="true" />
+            <element signature="e#2698#2699#0" expanded="true" />
+            <element signature="e#2764#2765#0" expanded="true" />
+            <element signature="e#2795#2796#0" expanded="true" />
+            <element signature="e#2843#2844#0" expanded="true" />
+            <element signature="e#2883#2884#0" expanded="true" />
+            <element signature="e#2948#2949#0" expanded="true" />
+            <element signature="e#2980#2981#0" expanded="true" />
+            <element signature="e#3030#3031#0" expanded="true" />
+            <element signature="e#3072#3073#0" expanded="true" />
+            <element signature="e#3134#3135#0" expanded="true" />
+            <element signature="e#3162#3163#0" expanded="true" />
+            <element signature="e#3204#3205#0" expanded="true" />
+            <element signature="e#3238#3239#0" expanded="true" />
+            <element signature="e#3307#3308#0" expanded="true" />
+            <element signature="e#3346#3347#0" expanded="true" />
+            <element signature="e#3410#3411#0" expanded="true" />
+            <element signature="e#3466#3467#0" expanded="true" />
+            <element signature="e#3537#3538#0" expanded="true" />
+            <element signature="e#3567#3568#0" expanded="true" />
+            <element signature="e#3613#3614#0" expanded="true" />
+            <element signature="e#3651#3652#0" expanded="true" />
+            <element signature="e#3721#3722#0" expanded="true" />
+            <element signature="e#3759#3760#0" expanded="true" />
+            <element signature="e#3821#3822#0" expanded="true" />
+            <element signature="e#3875#3876#0" expanded="true" />
+            <element signature="e#3953#3954#0" expanded="true" />
+            <element signature="e#3991#3992#0" expanded="true" />
+            <element signature="e#4053#4054#0" expanded="true" />
+            <element signature="e#4107#4108#0" expanded="true" />
+            <element signature="e#4186#4187#0" expanded="true" />
+            <element signature="e#4225#4226#0" expanded="true" />
+            <element signature="e#4289#4290#0" expanded="true" />
+            <element signature="e#4345#4346#0" expanded="true" />
+            <element signature="e#4430#4431#0" expanded="true" />
+            <element signature="e#4474#4475#0" expanded="true" />
+            <element signature="e#4698#4699#0" expanded="true" />
+            <element signature="e#4740#4741#0" expanded="true" />
+            <element signature="e#4810#4811#0" expanded="true" />
+            <element signature="e#4872#4873#0" expanded="true" />
+            <element signature="e#4955#4956#0" expanded="true" />
+            <element signature="e#4994#4995#0" expanded="true" />
+            <element signature="e#5058#5059#0" expanded="true" />
+            <element signature="e#5114#5115#0" expanded="true" />
+            <element signature="e#5194#5195#0" expanded="true" />
+            <element signature="e#5233#5234#0" expanded="true" />
+            <element signature="e#5297#5298#0" expanded="true" />
+            <element signature="e#5353#5354#0" expanded="true" />
+            <element signature="e#5428#5429#0" expanded="true" />
+            <element signature="e#5462#5463#0" expanded="true" />
+            <element signature="e#5516#5517#0" expanded="true" />
+            <element signature="e#5562#5563#0" expanded="true" />
+            <element signature="e#5634#5635#0" expanded="true" />
+            <element signature="e#5670#5671#0" expanded="true" />
+            <element signature="e#5728#5729#0" expanded="true" />
+            <element signature="e#5778#5779#0" expanded="true" />
+            <element signature="e#5852#5853#0" expanded="true" />
+            <element signature="e#5888#5889#0" expanded="true" />
+            <element signature="e#5946#5947#0" expanded="true" />
+            <element signature="e#5996#5997#0" expanded="true" />
+            <element signature="e#6067#6068#0" expanded="true" />
+            <element signature="e#6100#6101#0" expanded="true" />
+            <element signature="e#6152#6153#0" expanded="true" />
+            <element signature="e#6196#6197#0" expanded="true" />
+            <element signature="e#6261#6262#0" expanded="true" />
+            <element signature="e#6291#6292#0" expanded="true" />
+            <element signature="e#6337#6338#0" expanded="true" />
+            <element signature="e#6375#6376#0" expanded="true" />
+            <element signature="e#6437#6438#0" expanded="true" />
+            <element signature="e#6467#6468#0" expanded="true" />
+            <element signature="e#6513#6514#0" expanded="true" />
+            <element signature="e#6551#6552#0" expanded="true" />
+            <element signature="e#6613#6614#0" expanded="true" />
+            <element signature="e#6643#6644#0" expanded="true" />
+            <element signature="e#6689#6690#0" expanded="true" />
+            <element signature="e#6727#6728#0" expanded="true" />
+            <element signature="e#6796#6797#0" expanded="true" />
+            <element signature="e#6829#6830#0" expanded="true" />
+            <element signature="e#6881#6882#0" expanded="true" />
+            <element signature="e#6925#6926#0" expanded="true" />
+            <element signature="e#6995#6996#0" expanded="true" />
+            <element signature="e#7030#7031#0" expanded="true" />
+            <element signature="e#7086#7087#0" expanded="true" />
+            <element signature="e#7134#7135#0" expanded="true" />
+            <element signature="e#7202#7203#0" expanded="true" />
+            <element signature="e#7233#7234#0" expanded="true" />
+            <element signature="e#7281#7282#0" expanded="true" />
+            <element signature="e#7321#7322#0" expanded="true" />
+            <element signature="e#7390#7391#0" expanded="true" />
+            <element signature="e#7426#7427#0" expanded="true" />
+            <element signature="e#7484#7485#0" expanded="true" />
+            <element signature="e#7534#7535#0" expanded="true" />
+            <element signature="e#7602#7603#0" expanded="true" />
+            <element signature="e#7636#7637#0" expanded="true" />
+            <element signature="e#7690#7691#0" expanded="true" />
+            <element signature="e#7736#7737#0" expanded="true" />
+            <element signature="e#7806#7807#0" expanded="true" />
+            <element signature="e#7840#7841#0" expanded="true" />
+            <element signature="e#7894#7895#0" expanded="true" />
+            <element signature="e#7940#7941#0" expanded="true" />
+            <element signature="e#8006#8007#0" expanded="true" />
+            <element signature="e#8036#8037#0" expanded="true" />
+            <element signature="e#8082#8083#0" expanded="true" />
+            <element signature="e#8120#8121#0" expanded="true" />
+            <element signature="e#8189#8190#0" expanded="true" />
+            <element signature="e#8226#8227#0" expanded="true" />
+            <element signature="e#8286#8287#0" expanded="true" />
+            <element signature="e#8338#8339#0" expanded="true" />
+            <element signature="e#8417#8418#0" expanded="true" />
+            <element signature="e#8457#8458#0" expanded="true" />
+            <element signature="e#8523#8524#0" expanded="true" />
+            <element signature="e#8581#8582#0" expanded="true" />
+            <element signature="e#8655#8656#0" expanded="true" />
+            <element signature="e#8687#8688#0" expanded="true" />
+            <element signature="e#8737#8738#0" expanded="true" />
+            <element signature="e#8779#8780#0" expanded="true" />
+            <element signature="e#8846#8847#0" expanded="true" />
+            <element signature="e#8879#8880#0" expanded="true" />
+            <element signature="e#8931#8932#0" expanded="true" />
+            <element signature="e#8975#8976#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#787#788#0" expanded="true" />
+            <element signature="e#817#818#0" expanded="true" />
+            <element signature="e#2105#2106#0" expanded="true" />
+            <element signature="e#2135#2136#0" expanded="true" />
+            <element signature="e#2431#2432#0" expanded="true" />
+            <element signature="e#2461#2462#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index 854f1f1..0db633a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -165,12 +165,16 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String startDay,String endDay) {
+    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew) {
         try {
 
             Criteria criteria = createCriteria(PgAlarm.class);
             criteria.addOrder(Order.desc("id"));
 
+            if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) {
+                criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
+            }
+
             if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay))
             {
                 criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay)));
@@ -193,9 +197,11 @@
 
                 criteria.add(Restrictions.le("alarmDate",date));
             }
+            if(StringUtils.isNotBlank(isNew)&&isNew.equals("true"))
+                criteria.add(Restrictions.eq("active", 1));
 
             List<PgAlarm> pgAlarmList = criteria.list();
-            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
     }
 
     //根据设备位置(仓位)获取摄像机列表
-    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+    public List<PgDeviceDto> getPgCameraListByPosition(String partition,String position){
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.like("position",position+"%"));
-//        criteria.add(Restrictions.eq("devType","球机"));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(position))
+            criteria.add(Restrictions.like("position",position+"%"));
+
         criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
 
         List<PgDevice> pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
             dto.setDevCode(objects[5].toString());
             dto.setDevType(objects[6].toString());
             if(objects[7]!=null)
-            dto.setIp(objects[7].toString());
+                dto.setIp(objects[7].toString());
             dto.setIsOpen(objects[8].toString());
             dto.setPartition(objects[11].toString());
             dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index 8ebf74d..3c657a7 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgEquipment;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
 import com.casic.PgInterface.devTable.dto.PgEquipmentDto;
@@ -34,9 +35,12 @@
     public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
-        criteria.add(Restrictions.eq("eqName",eqName));
-        criteria.add(Restrictions.eq("eqCode",eqCode));
-        criteria.add(Restrictions.eq("eqType",eqType));
+        if(StringUtils.isNotBlank(eqName))
+            criteria.add(Restrictions.eq("eqName",eqName));
+        if(StringUtils.isNotBlank(eqCode))
+            criteria.add(Restrictions.eq("eqCode",eqCode));
+        if(StringUtils.isNotBlank(eqType))
+            criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
@@ -51,10 +55,9 @@
 
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
-        //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
         String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
-        +eqType+"' group by equipment.EQ_NAME";
+                +eqType+"' group by equipment.EQ_NAME";
 
         List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4ed68e4..e413a5c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
@@ -39,7 +40,8 @@
 
     public List<PgPipeLineDto> getPipeLineByLineType(String lineType) {
         Criteria criteria = createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineType", lineType));
+        if(StringUtils.isNotBlank(lineType))
+            criteria.add(Restrictions.eq("lineType", lineType));
 
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    private Long id;
-    private String keyId;//巡检记录单id
-    private String planId;//巡检计划ID
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    @Column(name="KEY_ID")
-    public String getKeyId() {
-        return keyId;
-    }
-
-    public void setKeyId(String keyId) {
-        this.keyId = keyId;
-    }
-
-    @Column(name="PLAN_ID")
-    public String getPlanId() {
-        return planId;
-    }
-
-    public void setPlanId(String planId) {
-        this.planId = planId;
-    }
-
-    @Column(name="CREATE_DATE")
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    @Column(name="STATE")
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    @Column(name="CREATOR")
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    @Column(name="PLAN_NAME")
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    @Column(name="RECORD_NO")
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    @Column(name="PLAN_NO")
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    @Column(name="RESPONSIBIE_DEPT")
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    @Column(name="INSPECTION_PERSON")
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    @Column(name="PATROL_MAN")
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    @Column(name="OPERATE_DATE")
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    @Column(name="REMARK")
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Column(name="BUILD_CABIN")
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    @Column(name="PROJECT")
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    @Column(name="START_PILE_NO")
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    @Column(name="END_PILE_NO")
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    @Column(name="INSPECTION_PRACE")
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    @Column(name="OTHER_PATROL_MAN")
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private Long id;
+    private String KEY_ID;//唯一键值
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_PERSON;//巡检人
+    private String START_DATE;//巡检开始时间
+    private String END_DATE;
+    private String FREQUENCY;//巡检频率
+    private String STATE;//状态
+    private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+    private String PLAN_NO;//巡检计划编号
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_MODE;//巡检方式
+    private String INSPECTION_ROUTE;//巡检路线
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String INSPECTION_GROUP;//巡检部门
+    private String INSERT_TIME;//插入时间
+    private String FREQUENCYDATE;//巡检具体日期
+    private String FREQUENCYTIME;//巡检具体时间
+    private String CREATEDATE;//创建时间
+    private String CREATOR;//创建人
+    private String PROJECT;//项目
+    private String COMLILE;//编制人
+    private String START_TIME;//编制时间
+    private String DEVELOP_DEPT;//制定部门
+    private String END_TIME;//结束时间
+    private String START_PILE_NO;//开始桩号
+    private String END_PILE_NO;//结束桩号
+    private String BUILD_CABIN;//巡检舱室
+    private String MILEAGE;
+    private String FREQUENCY_TIME;//巡检具体时间
+    private String FREQUENCYTIME_END;
+    private String KETTLE_TS;
+    private String UPDATEDATE;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="KEY_ID")
+    public String getKEY_ID() {
+        return KEY_ID;
+    }
+
+    public void setKEY_ID(String KEY_ID) {
+        this.KEY_ID = KEY_ID;
+    }
+
+    @Column(name="PLAN_NAME")
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    @Column(name="INSPECTION_PERSON")
+    public String getINSPECTION_PERSON() {
+        return INSPECTION_PERSON;
+    }
+
+    public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+        this.INSPECTION_PERSON = INSPECTION_PERSON;
+    }
+
+    @Column(name="START_DATE")
+    public String getSTART_DATE() {
+        return START_DATE;
+    }
+
+    public void setSTART_DATE(String START_DATE) {
+        this.START_DATE = START_DATE;
+    }
+
+    @Column(name="END_DATE")
+    public String getEND_DATE() {
+        return END_DATE;
+    }
+
+    public void setEND_DATE(String END_DATE) {
+        this.END_DATE = END_DATE;
+    }
+
+    @Column(name="FREQUENCY")
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    @Column(name="STATE")
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    @Column(name="RESPONSIBLE_DEPT")
+    public String getRESPONSIBLE_DEPT() {
+        return RESPONSIBLE_DEPT;
+    }
+
+    public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+        this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+    }
+
+    @Column(name="PLAN_NO")
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    @Column(name="INSPECTION_TYPE")
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    @Column(name="INSPECTION_MODE")
+    public String getINSPECTION_MODE() {
+        return INSPECTION_MODE;
+    }
+
+    public void setINSPECTION_MODE(String INSPECTION_MODE) {
+        this.INSPECTION_MODE = INSPECTION_MODE;
+    }
+
+    @Column(name="INSPECTION_ROUTE")
+    public String getINSPECTION_ROUTE() {
+        return INSPECTION_ROUTE;
+    }
+
+    public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+        this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+    }
+
+    @Column(name="INSPECTION_START_TIME")
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    @Column(name="INSPECTION_END_TIME")
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    @Column(name="INSPECTION_PRACE")
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    @Column(name="INSPECTION_GROUP")
+    public String getINSPECTION_GROUP() {
+        return INSPECTION_GROUP;
+    }
+
+    public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+        this.INSPECTION_GROUP = INSPECTION_GROUP;
+    }
+
+    @Column(name="INSERT_TIME")
+    public String getINSERT_TIME() {
+        return INSERT_TIME;
+    }
+
+    public void setINSERT_TIME(String INSERT_TIME) {
+        this.INSERT_TIME = INSERT_TIME;
+    }
+
+    @Column(name="FREQUENCYDATE")
+    public String getFREQUENCYDATE() {
+        return FREQUENCYDATE;
+    }
+
+    public void setFREQUENCYDATE(String FREQUENCYDATE) {
+        this.FREQUENCYDATE = FREQUENCYDATE;
+    }
+
+    @Column(name="FREQUENCYTIME")
+    public String getFREQUENCYTIME() {
+        return FREQUENCYTIME;
+    }
+
+    public void setFREQUENCYTIME(String FREQUENCYTIME) {
+        this.FREQUENCYTIME = FREQUENCYTIME;
+    }
+
+    @Column(name="CREATEDATE")
+    public String getCREATEDATE() {
+        return CREATEDATE;
+    }
+
+    public void setCREATEDATE(String CREATEDATE) {
+        this.CREATEDATE = CREATEDATE;
+    }
+
+    @Column(name="CREATOR")
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    @Column(name="PROJECT")
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    @Column(name="COMLILE")
+    public String getCOMLILE() {
+        return COMLILE;
+    }
+
+    public void setCOMLILE(String COMLILE) {
+        this.COMLILE = COMLILE;
+    }
+
+    @Column(name="START_TIME")
+    public String getSTART_TIME() {
+        return START_TIME;
+    }
+
+    public void setSTART_TIME(String START_TIME) {
+        this.START_TIME = START_TIME;
+    }
+
+    @Column(name="DEVELOP_DEPT")
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    @Column(name="END_TIME")
+    public String getEND_TIME() {
+        return END_TIME;
+    }
+
+    public void setEND_TIME(String END_TIME) {
+        this.END_TIME = END_TIME;
+    }
+
+    @Column(name="START_PILE_NO")
+    public String getSTART_PILE_NO() {
+        return START_PILE_NO;
+    }
+
+    public void setSTART_PILE_NO(String START_PILE_NO) {
+        this.START_PILE_NO = START_PILE_NO;
+    }
+
+    @Column(name="END_PILE_NO")
+    public String getEND_PILE_NO() {
+        return END_PILE_NO;
+    }
+
+    public void setEND_PILE_NO(String END_PILE_NO) {
+        this.END_PILE_NO = END_PILE_NO;
+    }
+
+    @Column(name="BUILD_CABIN")
+    public String getBUILD_CABIN() {
+        return BUILD_CABIN;
+    }
+
+    public void setBUILD_CABIN(String BUILD_CABIN) {
+        this.BUILD_CABIN = BUILD_CABIN;
+    }
+
+    @Column(name="MILEAGE")
+    public String getMILEAGE() {
+        return MILEAGE;
+    }
+
+    public void setMILEAGE(String MILEAGE) {
+        this.MILEAGE = MILEAGE;
+    }
+
+    @Column(name="FREQUENCY_TIME")
+    public String getFREQUENCY_TIME() {
+        return FREQUENCY_TIME;
+    }
+
+    public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+        this.FREQUENCY_TIME = FREQUENCY_TIME;
+    }
+
+    @Column(name="FREQUENCYTIME_END")
+    public String getFREQUENCYTIME_END() {
+        return FREQUENCYTIME_END;
+    }
+
+    public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+        this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+    }
+
+    @Column(name="KETTLE_TS")
+    public String getKETTLE_TS() {
+        return KETTLE_TS;
+    }
+
+    public void setKETTLE_TS(String KETTLE_TS) {
+        this.KETTLE_TS = KETTLE_TS;
+    }
+
+    @Column(name="UPDATEDATE")
+    public String getUPDATEDATE() {
+        return UPDATEDATE;
+    }
+
+    public void setUPDATEDATE(String UPDATEDATE) {
+        this.UPDATEDATE = UPDATEDATE;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 5346b57..2f8d359 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -66,7 +66,7 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REPAIRMAN")
+    @Column(name="REOAIRMAN")
     public String getRepairMan() {
         return repairMan;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
-    private Long id;
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-
-
-    public static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
-        PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
-        pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
-        pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
-        pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
-        pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
-        pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
-        pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
-        pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
-        pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
-        pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
-        pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
-        pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
-        pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
-        pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
-        pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
-        return pgAssetInSpectionRecordDto;
-    }
-
-
-    public static List<PgAssetInSpectionRecordDto> ConvertToDtoList(List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList){
-        List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-        for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
-            pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
-        }
-
-        return pgAssetInSpectionRecordDtoList;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
-    private String num;
-    private String createDate;
-
-    public String getNum() {
-        return num;
-    }
-
-    public void setNum(String num) {
-        this.num = num;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+    private Long id;
+    private String PLAN_NO;//巡检计划编号
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String FREQUENCY;//巡检频率
+    private String CREATOR;//创建人
+    private String DEVELOP_DEPT;//制定部门
+    private String PROJECT;//项目
+    private String STATE;//状态
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+        PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+        pgAssetPlanDto.setId(pgAssetPlan.getId());
+        pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+        pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+        pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+        pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+        pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+        pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+        pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+        pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+        pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+        pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+        pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+        return pgAssetPlanDto;
+    }
+
+    public static List<PgAssetPlanDto> ConvertToPgAssetDtoList(List<PgAssetPlan> pgAssetPlanList){
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
+
+        for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+            pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+        }
+
+        return pgAssetPlanDtoList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
new file mode 100644
index 0000000..bc12db1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
@@ -0,0 +1,24 @@
+package com.casic.PgInterface.maintenance.dto;
+
+public class PgAssetPlanStatic {
+
+    private String num;
+    private String createDate;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
deleted file mode 100644
index c41ca7d..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.casic.PgInterface.maintenance.manager;
-
-import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
-
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
-        try {
-            String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
-                    "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
-                    "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-
-            if(patrolMan!=null)
-                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
-            if(startTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
-            if(endTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')<to_date('"+endTime+"','yyyy-MM-dd')";
-
-            sql+=" order by id";
-
-            List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
-
-            List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList=new ArrayList<>();
-            for(Object[] objects1:objects){
-                PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord();
-
-                pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString()));
-                pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1]));
-                pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2]));
-                pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3]));
-                pgAssetInSpectionRecord.setState(String.valueOf(objects1[4]));
-                pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5]));
-                pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6]));
-                pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7]));
-                pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8]));
-                pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9]));
-                pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10]));
-                pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11]));
-                pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12]));
-                pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13]));
-                pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14]));
-                pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15]));
-                pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16]));
-                pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17]));
-                pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18]));
-                pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19]));
-
-                pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord);
-            }
-
-            List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-            for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList)
-            {
-                pgAssetInSpectionRecordDtoList.add(PgAssetInSpectionRecordDto.ConvertToDto(pgAssetInSpectionRecord));
-            }
-
-            return pgAssetInSpectionRecordDtoList;
-        }
-        catch(Exception e)
-        {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public List<PgAssetInSpectionRecordStatic> getPgAssetInSpectionRecordStaticLisByTime(
-            String startTime, String endTime, String staticType) {
-
-        String sql="";
-        String dateType="";
-        List<PgAssetInSpectionRecordStatic> pgAssetInSpectionRecordStaticList=new ArrayList<>();
-        int type=Integer.valueOf(staticType);
-
-        switch(type) {
-            case 0://年
-                dateType = "yyyy";
-                break;
-            case 1://月
-                dateType = "yyyy-mm";
-                break;
-            case 2://周
-                dateType = "iw";
-                break;
-            case 3://日
-                dateType="yyyy-mm-dd";
-                break;
-            default:
-                break;
-        }
-
-        sql="select count(*), to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_RECORD t where 1=1";
-
-        if(startTime!=null)
-            sql+=" and t.CREATE_DATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
-        if(endTime!=null)
-            sql+=" and t.CREATE_DATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
-
-        sql+=" group by to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"')";
-
-        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
-        for(int i=0;i<objects.size();i++)
-        {
-            PgAssetInSpectionRecordStatic pgAssetInSpectionRecordStatic=new PgAssetInSpectionRecordStatic();
-            pgAssetInSpectionRecordStatic.setNum(objects.get(i)[0].toString());
-            pgAssetInSpectionRecordStatic.setCreateDate(objects.get(i)[1].toString());
-            pgAssetInSpectionRecordStaticList.add(pgAssetInSpectionRecordStatic);
-        }
-        return pgAssetInSpectionRecordStaticList;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
new file mode 100644
index 0000000..bb6bf1e
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
@@ -0,0 +1,81 @@
+package com.casic.PgInterface.maintenance.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgAssetPlanManager extends HibernateEntityDao<PgAssetPlan> {
+
+    public List<PgAssetPlanDto> getPgAssetPlanDtoList(String inSpectionPlace){
+        Criteria criteria=createCriteria(PgAssetPlan.class);
+
+        if(StringUtils.isNotBlank(inSpectionPlace))
+            criteria.add(Restrictions.like("INSPECTION_PRACE","%"+inSpectionPlace+"%"));
+        criteria.addOrder(Order.desc("id"));
+
+        List<PgAssetPlan> pgAssetPlanList=criteria.list();
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=PgAssetPlanDto.ConvertToPgAssetDtoList(pgAssetPlanList);
+
+        if(pgAssetPlanDtoList==null||pgAssetPlanDtoList.size()==0)
+            return null;
+        else
+            return pgAssetPlanDtoList;
+    }
+
+    public List<PgAssetPlanStatic> getPgAssetPlanStaticLisByTime(
+            String startTime, String endTime, String staticType) {
+
+        String sql="";
+        String dateType="";
+        List<PgAssetPlanStatic> pgAssetPlanStaticList=new ArrayList<>();
+        int type=Integer.valueOf(staticType);
+
+        switch(type) {
+            case 0://年
+                dateType = "yyyy";
+                break;
+            case 1://月
+                dateType = "yyyy-mm";
+                break;
+            case 2://周
+                dateType = "iw";
+                break;
+            case 3://日
+                dateType="yyyy-mm-dd";
+                break;
+            default:
+                break;
+        }
+
+        sql="select count(*), to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_PLAN t where 1=1";
+
+        if(startTime!=null)
+            sql+=" and t.CREATEDATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
+        if(endTime!=null)
+            sql+=" and t.CREATEDATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
+
+        sql+=" group by to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"')";
+
+        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
+        for(int i=0;i<objects.size();i++)
+        {
+            PgAssetPlanStatic pgAssetPlanStatic=new PgAssetPlanStatic();
+            pgAssetPlanStatic.setNum(objects.get(i)[0].toString());
+            pgAssetPlanStatic.setCreateDate(objects.get(i)[1].toString());
+            pgAssetPlanStaticList.add(pgAssetPlanStatic);
+        }
+        return pgAssetPlanStaticList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 0903f22..3484739 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -15,7 +15,7 @@
 
     public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
             if(repairMan!=null)
                 sql+=" and REPAIRMAN like '%"+repairMan+"%'";
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index 9cc2881..6d90d7b 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -1,5 +1,7 @@
 package com.casic.PgInterface.patroler.dto;
 
+import com.casic.PgInterface.devTable.domain.PgDevice;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 
 /**
@@ -14,6 +16,7 @@
     private String unit;//单位
     private String alarmType;//报警类型
     private Long pgDeviceId;//设备编号
+    private String assetCode;//资产编号
 
     public Long getId() {
         return id;
@@ -71,7 +74,15 @@
         this.pgDeviceId = pgDeviceId;
     }
 
-    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
+    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule, PgDeviceManager pgDeviceManager) {
         this.setId(pgAlarmRule.getId());
         this.setHighValue(pgAlarmRule.getHighValue());
         this.setLowValue(pgAlarmRule.getLowValue());
@@ -82,6 +93,10 @@
         else
             this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
         this.setPgDeviceId(pgAlarmRule.getPgDeviceId());
+        if(pgAlarmRule.getAlarmTypeId()!=null&&pgDeviceManager.get(pgAlarmRule.getPgDeviceId())!=null)
+            this.setAssetCode(pgDeviceManager.get(pgAlarmRule.getPgDeviceId()).getAssetCode());
+        else
+            this.setAssetCode("");
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
index c132c98..a7cef5b 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
@@ -1,13 +1,17 @@
 package com.casic.PgInterface.patroler.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.ResponseStatus;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -17,30 +21,23 @@
 @Service
 public class PgAlarmRuleManager extends HibernateEntityDao<PgAlarmRule> {
 
+    @Resource
+    private PgDeviceManager pgDeviceManager;
+
     //根据设备获取设备报警阈值
-    public List<PgAlarmRuleDto>  getAlarmRuleDto() {
+    public List<PgAlarmRuleDto>  getAlarmRuleDto(String devType) {
         Criteria criteria=createCriteria(PgAlarmRule.class);
+
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.eq("devType", devType));
         criteria.addOrder(Order.desc("id"));
 
         List<PgAlarmRule> pgAlarmRuleList=criteria.list();
-        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
+        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         for (PgAlarmRule pgAlarmRule : pgAlarmRuleList) {
-            pgAlarmRuleDtoList.add(new PgAlarmRuleDto(pgAlarmRule));
+            pgAlarmRuleDtoList.add(new PgAlarmRuleDto(pgAlarmRule,pgDeviceManager));
         }
         return pgAlarmRuleDtoList;
-
     }
 
-    public PgAlarmRule getAlarmRuleBydevType(String devType) {
-        Criteria criteria=createCriteria(PgAlarmRule.class);
-        criteria.add(Restrictions.eq("devType", devType));
-
-        List<PgAlarmRule> pgAlarmRuleList=criteria.list();
-
-        if(pgAlarmRuleList==null||pgAlarmRuleList.size()==0)
-            return null;
-        else
-            return pgAlarmRuleList.get(0);
-    }
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index d0e28f5..082ba5d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgAlarm;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
@@ -39,7 +40,7 @@
     private PgReservePlanManager pgReservePlanManager;
 
     /*
-    * 获取报警设备信息
+     * 获取报警设备信息
      */
     @POST
     @Path("linkDevice")
@@ -50,11 +51,22 @@
 
         PgDeviceDto pgDeviceDto = null;
         try {
-            PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
-            PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
-
-            pgDeviceDto=new PgDeviceDto(pgDevice);
-            msg = "报警关联设备获取成功";
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if (pgAlarm == null)
+                    msg = "不存在报警信息";
+                else {
+                    PgDevice pgDevice = pgAlarm.getAlarmDevId();
+                    if (pgDevice == null)
+                        msg = "不存在报警设备";
+                    else {
+                        pgDeviceDto = new PgDeviceDto(pgDevice);
+                        msg = "报警关联设备获取成功";
+                    }
+                }
+            }
+            else
+                msg="未接受到报警设备ID信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取关联设备失败";
@@ -77,11 +89,28 @@
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
-            PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
-            PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
-            pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if(pgAlarm==null)
+                    msg="不存在报警信息";
+                else {
+                    PgDevice pgDevice = pgAlarm.getAlarmDevId();
+                    if (pgDevice == null)
+                        msg = "不存在报警设备";
+                    else {
+                        String strPosition=pgDevice.getPosition();
+                        String position="";
+                        if(!strPosition.equals(""))
+                            position=pgDevice.getPosition().substring(0,3);
+                        String partition=pgDevice.getPartition();
 
-            msg = "关联设备获取成功";
+                        pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
+                        msg = "关联设备获取成功";
+                    }
+                }
+            }
+            else
+                msg="请输入报警设备Id信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "分区设备关联失败";
@@ -93,7 +122,7 @@
 
     /*
      * 根据报警记录获取关联的预案
-    */
+     */
     @POST
     @Path("linkReservePlan")
     @Produces(MediaType.APPLICATION_JSON)
@@ -103,10 +132,21 @@
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
-            PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
-            pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if (pgAlarm == null)
+                    msg = "不存在报警信息";
+                else {
+                    pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-            msg="关联预案获取成功";
+                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
+                        msg="不存在关联的报警预案";
+                    else
+                        msg = "关联预案获取成功";
+                }
+            }
+            else
+                msg="请输入报警信息";
         }
         catch(Exception e)
         {
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index d18ebb8..baacd93 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -48,14 +48,16 @@
     @POST
     @Path("getAlarmInfo")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmList(@FormParam("startDay") String startDay,
-                                            @FormParam("endDay") String endDay) throws Exception {
+    public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
+                                            @FormParam("startDay") String startDay,
+                                            @FormParam("endDay") String endDay,
+                                            @FormParam("isNew") String isNew) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(startDay,endDay);
-            if (pgAlarmDtoList.size() == 0)
+            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew);
+            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
                 msg = "没有报警信息";
             else
                 msg = "报警信息获取成功";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 87afd54..29ce8a4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -1,7 +1,5 @@
 package com.casic.PgInterface.rs;
 
-import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager;
-import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import com.casic.PgInterface.patroler.manager.PgAlarmRuleManager;
@@ -30,119 +28,23 @@
     private static Logger logger = LoggerFactory.getLogger(PgAlarmRule.class);
 
     @Resource
-    private PgDeviceManager pgDeviceManager;
-    @Resource
-    private PgAlarmTypeManager pgAlarmTypeManager;
-    @Resource
     private PgAlarmRuleManager pgAlarmRuleManager;
 
-
-
-    /**
-     * 新增报警阈值
-     */
-    @POST
-    @Path("addAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> addAlarmRule(@FormParam("highValue") String highValue,
-                                            @FormParam("lowValue") String lowValue,
-                                            @FormParam("unit") String unit,
-                                            @FormParam("devType") String devType,
-                                            @FormParam("alarmType") String alarmType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType);
-            if (pgAlarmRule != null) {
-                result = "false";
-                msg = "设备阈值已经存在";
-            } else {
-                pgAlarmRule = new PgAlarmRule();
-                pgAlarmRule.setHighValue(highValue);
-                pgAlarmRule.setLowValue(lowValue);
-                pgAlarmRule.setDevType(devType);
-                pgAlarmRule.setUnit(unit);
-                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
-
-                pgAlarmRuleManager.save(pgAlarmRule);
-                result = "true";
-                msg = "报警阈值新增成功";
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = "false";
-            msg = "报警阈值新增失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-        return resultMap;
-    }
-
-    /**
-     * 编辑报警阈值
-     */
-    @POST
-    @Path("editAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> editAlarmRule(@FormParam("id") String id,
-                                             @FormParam("devType") String devType,
-                                             @FormParam("highValue") String highValue,
-                                             @FormParam("lowValue") String lowValue,
-                                             @FormParam("unit") String unit,
-                                             @FormParam("alarmType") String alarmType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
-            if (pgAlarmRule == null) {
-                msg = "不存在报警阈值记录";
-                result = "false";
-            } else {
-                pgAlarmRule.setDevType(devType);
-                pgAlarmRule.setHighValue(highValue);
-                pgAlarmRule.setLowValue(lowValue);
-                pgAlarmRule.setUnit(unit);
-                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
-
-                pgAlarmRuleManager.save(pgAlarmRule);
-                msg = "编辑成功";
-                result = "true";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            result = "false";
-            msg = "报警阈值编辑失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-
-        return resultMap;
-    }
-
     /**
      * 获取报警阈值信息
      */
     @POST
     @Path("getAlarmRule")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmRule() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+    public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
+        System.out.println("devType:"+devType);
+        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
-            pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto();
-            if (pgAlarmRuleDtoList == null)
+            pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
+            if (pgAlarmRuleDtoList == null||pgAlarmRuleDtoList.size()==0)
                 msg = "不存在报警阈值信息";
             else
                 msg = "报警阈值获取成功";
@@ -155,69 +57,4 @@
         return resultMap;
     }
 
-    /**
-     * 删除报警阈值
-     */
-    @POST
-    @Path("deleteAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> deleteAlarmRule(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
-            if (pgAlarmRule == null) {
-                msg = "不存在报警阈值记录";
-                result = "false";
-            } else {
-                pgAlarmRuleManager.remove(pgAlarmRule);
-                msg = "删除成功";
-                result = "true";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            result = "false";
-            msg = "报警阈值删除失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-
-        return resultMap;
-    }
-
-    /**
-     * 根据设备类型报警阈值
-     */
-    @POST
-    @Path("getAlarmRuleByDevType")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmRuleByDevType(@FormParam("devType") String devType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        PgAlarmRule pgAlarmRule = null;
-        List<PgAlarmRuleDto> pgAlarmRuleDtos = new ArrayList<>();
-        try {
-            pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType);
-            if (pgAlarmRule == null)
-                msg = "不存在报警阈值记录";
-            else {
-                PgAlarmRuleDto pgAlarmRuleDto= new PgAlarmRuleDto(pgAlarmRule);
-                pgAlarmRuleDtos.add(pgAlarmRuleDto);
-                msg = "报警阈值获取成功";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            msg = "报警阈值获取失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmRuleDtos);
-
-        return resultMap;
-    }
-
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
new file mode 100644
index 0000000..19d3b8c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanRs")
+public class PgAssetPlanRs {
+
+    @Resource
+    private PgAssetPlanManager pgAssetPlanManager;
+
+    /**
+     * 获取巡检记录
+     */
+    @POST
+    @Path("getPgAssetPlanList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPgAssetPlanList(@FormParam("inSpectionPlace") String inSpectionPlace){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
+        try{
+            pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(inSpectionPlace);
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
+                msg="巡检信息获取成功";
+            else
+                msg="不存在巡检信息";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="巡检信息获取失败";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAssetPlanDtoList);
+
+        return resultMap;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
new file mode 100644
index 0000000..47ef9d1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanStaticRs")
+public class PgAssetPlanStaticRs {
+
+    @Resource
+    private PgAssetPlanManager pgAssetPlanManager;
+
+    @POST
+    @Path("getPgAssetPlanStaticList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPgAssetPlanStaticList(@FormParam("startTime") String startTime,
+                                                       @FormParam("endTime") String endTime,
+                                                       @FormParam("staticType") String staticType) throws Exception{
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
+        try{
+            pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
+                msg="巡检统计信息获取成功";
+            else
+                msg="统计信息获取失败";
+        }
+        catch (Exception ex){
+            ex.printStackTrace();
+            msg="统计失败";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAssetPlanStaticList);
+
+        return resultMap;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
deleted file mode 100644
index 66f4d09..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.manager.PgAssetInSpectionRecordManager;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@Path("pgAssetRecordRs")
-public class PgAssetRecordRs {
-
-    @Resource
-    private PgAssetInSpectionRecordManager pgAssetInSpectionRecordManager;
-
-    /**
-     * 获取巡检记录
-     */
-    @POST
-    @Path("getPgAssetRecordList")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgAssetRecordList(@FormParam("patrolMan") String patrolMan,
-                                                   @FormParam("startTime") String startTime,
-                                                   @FormParam("endTime") String endTime){
-        Map<String,Object> resultMap=new HashMap<>();
-        String msg="";
-
-        List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-        try{
-            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(patrolMan,startTime,endTime);
-            if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0)
-                msg="巡检信息获取成功";
-            else
-                msg="不存在巡检信息";
-        }
-        catch(Exception ex){
-            ex.printStackTrace();
-            msg="巡检信息获取失败";
-        }
-
-        resultMap.put("msg",msg);
-        resultMap.put("result",pgAssetInSpectionRecordDtoList);
-
-        return resultMap;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java
deleted file mode 100644
index 5f0417a..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import com.casic.PgInterface.maintenance.manager.PgAssetInSpectionRecordManager;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@Path("pgAssetRecordStaticRs")
-public class PgAssetRecordStaticRs {
-
-    @Resource
-    private PgAssetInSpectionRecordManager pgAssetInSpectionRecordManager;
-
-    @POST
-    @Path("getPgAssetRecordHeadStaticList")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgAssetRecordHeadStaticList(@FormParam("startTime") String startTime,
-                                                                @FormParam("endTime") String endTime,
-                                                                @FormParam("staticType") String staticType) throws Exception{
-        Map<String,Object> resultMap=new HashMap<>();
-        String msg="";
-        String result="";
-
-        List<PgAssetInSpectionRecordStatic> pgAssetInSpectionRecordStaticList = null;
-        try{
-            pgAssetInSpectionRecordStaticList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetInSpectionRecordStaticList!=null&&pgAssetInSpectionRecordStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
-            else
-                msg="统计信息获取失败";
-        }
-        catch (Exception ex){
-            ex.printStackTrace();
-            msg="统计失败";
-        }
-
-        resultMap.put("msg",msg);
-        resultMap.put("result",pgAssetInSpectionRecordStaticList);
-
-        return resultMap;
-    }
-
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index 9dfdd88..a0245ba 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -326,7 +326,7 @@
 
             PgConstruction pgConstruction=pgConstructionManager.get(Long.valueOf(id));
 
-            pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(pgConstruction.getPgName());
+            pgDeviceDtoList=pgDeviceManager.getPgCameraListByPartition(pgConstruction.getPgName());
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index 1c8130c..c276fb3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -177,6 +177,7 @@
             else
             {
                 pgEquipment.setActive(0);
+                pgEquipmentManager.save(pgEquipment);
                 msg="删除成功";
                 result="true";
             }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index 486b49f..f0b936c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -287,7 +287,7 @@
         try {
             if (apCode != "") {
                 String apCodeStr=apCode.substring(0,3);
-                pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(apCodeStr);
+                pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition("",apCodeStr);
                 if(pgDeviceDtoList==null)
                     msg="不存在关联摄像机";
                 else
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 982e3d9..a6da81e 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -11,15 +11,13 @@
 
 
 # ============================================================================
-# dbd
+# db
 # ============================================================================
 db.default.driverClassName=oracle.jdbc.driver.OracleDriver
-db.default.url=jdbc:oracle:thin:@172.17.0.201:1521:szgl
-#db.default.url=jdbc:oracle:thin:@119.254.103.80:1521:chengdu
-db.default.username=scott
-db.default.password=scott
-#db.default.username=PG
-#db.default.password=PG
+#db.default.url=jdbc:oracle:thin:@172.17.0.201:1521:szgl
+db.default.url=jdbc:oracle:thin:@119.254.103.80:1521:chengdu
+db.default.username=PG
+db.default.password=PG
 
 
 # ============================================================================

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ff69e2a..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,27 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190828.docx" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -32,72 +42,119 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="2" />
-          <entry key="java" value="243" />
-          <entry key="properties" value="6" />
+          <entry key="java" value="321" />
+          <entry key="properties" value="8" />
           <entry key="xml" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
-          <entry key="JAVA" value="243" />
-          <entry key="Properties" value="6" />
+          <entry key="JAVA" value="321" />
+          <entry key="Properties" value="8" />
           <entry key="XML" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="8082" />
-          <entry key="properties" value="49" />
-          <entry key="txt" value="64" />
+          <entry key="dummy" value="16" />
+          <entry key="java" value="10723" />
+          <entry key="properties" value="59" />
+          <entry key="txt" value="118" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="8082" />
-          <entry key="PLAIN_TEXT" value="64" />
-          <entry key="Properties" value="49" />
+          <entry key="JAVA" value="10723" />
+          <entry key="PLAIN_TEXT" value="134" />
+          <entry key="Properties" value="59" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="4" />
+          <entry key="project.closed" value="28" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
           <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.24" value="1" />
+          <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="1" />
-          <entry key="project.open.time.3" value="3" />
-          <entry key="project.open.time.31" value="1" />
+          <entry key="project.open.time.28" value="1" />
+          <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.31" value="2" />
           <entry key="project.open.time.37" value="1" />
+          <entry key="project.open.time.39" value="2" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.40" value="1" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="1" />
+          <entry key="project.open.time.44" value="2" />
           <entry key="project.open.time.45" value="2" />
           <entry key="project.open.time.48" value="1" />
           <entry key="project.open.time.49" value="1" />
+          <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.58" value="1" />
           <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.71" value="1" />
+          <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.71" value="2" />
           <entry key="project.open.time.76" value="1" />
-          <entry key="project.opened" value="25" />
+          <entry key="project.opened" value="41" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+            <state relative-caret-position="174">
+              <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
               <folding>
-                <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-                <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="352">
+              <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#787#788#0" expanded="true" />
+                <element signature="e#817#818#0" expanded="true" />
+                <element signature="e#2105#2106#0" expanded="true" />
+                <element signature="e#2135#2136#0" expanded="true" />
+                <element signature="e#2431#2432#0" expanded="true" />
+                <element signature="e#2461#2462#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="638">
+              <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+              <folding>
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -122,6 +179,7 @@
       <find>getPgDeviceByDevType</find>
       <find>message</find>
       <find>getConstructionByType</find>
+      <find>getPgCameraListByPosition</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -130,24 +188,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanTypeDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
@@ -162,17 +207,38 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
       </list>
     </option>
   </component>
@@ -208,16 +274,18 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="3" />
-    <option name="y" value="10" />
-    <option name="width" value="1386" />
-    <option name="height" value="788" />
+    <option name="x" value="1410" />
+    <option name="y" value="117" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -258,7 +326,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -267,16 +335,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -286,7 +345,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="dto" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -296,7 +355,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="manager" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -308,19 +367,10 @@
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="webapp" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -359,6 +409,7 @@
       </deployment>
       <server-settings>
         <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_7" />
+        <option name="JNDI_PORT" value="10991" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -456,7 +507,23 @@
       <workItem from="1566350810712" duration="6803000" />
       <workItem from="1566435787074" duration="10717000" />
       <workItem from="1566521753529" duration="14265000" />
-      <workItem from="1566614176989" duration="5693000" />
+      <workItem from="1566614176989" duration="14059000" />
+      <workItem from="1566780822009" duration="1026000" />
+      <workItem from="1566891563975" duration="284000" />
+      <workItem from="1566893107340" duration="3382000" />
+      <workItem from="1566953794976" duration="11039000" />
+      <workItem from="1567059357700" duration="484000" />
+      <workItem from="1567082835097" duration="1086000" />
+      <workItem from="1567126428020" duration="1539000" />
+      <workItem from="1567129277820" duration="5788000" />
+      <workItem from="1567136008996" duration="2568000" />
+      <workItem from="1567237040302" duration="111000" />
+      <workItem from="1567495626345" duration="2797000" />
+      <workItem from="1567558770152" duration="2352000" />
+      <workItem from="1567577368149" duration="640000" />
+      <workItem from="1567751224608" duration="780000" />
+      <workItem from="1568019299799" duration="695000" />
+      <workItem from="1568082566133" duration="4016000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -493,17 +560,60 @@
       <option name="project" value="LOCAL" />
       <updated>1566553388171</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="整理管线部分">
+      <created>1566620046627</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1566620046627</updated>
+    </task>
+    <task id="LOCAL-00007" summary="合并代码提交">
+      <created>1566781001910</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1566781001910</updated>
+    </task>
+    <task id="LOCAL-00008" summary="合并代码提交">
+      <created>1566963831930</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1566963831930</updated>
+    </task>
+    <task id="LOCAL-00009" summary="修改报警阈值">
+      <created>1566972146710</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1566972146710</updated>
+    </task>
+    <task id="LOCAL-00010" summary="修改巡检维护表字段">
+      <created>1567126525554</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1567126525554</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="142930000" />
+    <option name="totallyTimeSpent" value="189883000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
+    <frame x="1358" y="-8" width="1456" height="916" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29297996" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -511,13 +621,14 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Thumbnails" weight="0.3295082" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.5081967" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.3849105" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
       <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
       <window_info anchor="bottom" id="Spring" order="8" />
       <window_info anchor="bottom" id="Terminal" order="9" />
@@ -539,7 +650,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2193646" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -547,22 +658,23 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.47540984" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
-      <window_info anchor="bottom" id="Spring" order="8" />
-      <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
-      <window_info anchor="bottom" id="Statistic" order="11" />
-      <window_info anchor="bottom" id="Java Enterprise" order="12" />
-      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="14" weight="0.32786885" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.52307695" />
+      <window_info anchor="bottom" id="Thumbnails" order="0" weight="0.3295082" />
+      <window_info anchor="bottom" id="Message" order="1" />
+      <window_info anchor="bottom" id="Find" order="2" />
+      <window_info anchor="bottom" id="Run" order="3" />
+      <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.49924356" weight="0.49344262" />
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Application Servers" order="8" weight="0.3276923" />
+      <window_info anchor="bottom" id="Spring" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
+      <window_info anchor="bottom" id="Statistic" order="12" />
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <window_info anchor="bottom" id="Database Changes" order="14" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="15" weight="0.32786885" />
+      <window_info anchor="bottom" id="Messages" order="16" weight="0.5229508" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -578,6 +690,16 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -587,7 +709,11 @@
     <MESSAGE value="修改权限问题" />
     <MESSAGE value="修改人员登录返回接口" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整理管线部分" />
+    <MESSAGE value="合并代码提交" />
+    <MESSAGE value="修改报警阈值" />
+    <MESSAGE value="修改巡检维护表字段" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护表字段" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -602,322 +728,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-532">
-          <caret line="50" column="28" lean-forward="true" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="19" column="60" selection-start-line="19" selection-start-column="60" selection-end-line="19" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="100" column="34" lean-forward="true" selection-start-line="100" selection-start-column="34" selection-end-line="100" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1474">
-          <caret line="84" column="58" selection-start-line="84" selection-start-column="58" selection-end-line="84" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1100">
-          <caret line="58" column="18" selection-start-line="58" selection-start-column="18" selection-end-line="58" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6842">
-          <caret line="329" selection-start-line="329" selection-end-line="329" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="102" column="24" lean-forward="true" selection-start-line="102" selection-start-column="24" selection-end-line="102" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="72" column="56" lean-forward="true" selection-start-line="72" selection-start-column="56" selection-end-line="72" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="90" column="39" lean-forward="true" selection-start-line="90" selection-start-column="39" selection-end-line="90" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="97" column="16" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
-          <caret line="14" column="52" lean-forward="true" selection-start-line="14" selection-start-column="52" selection-end-line="14" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="26" column="34" lean-forward="true" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="61" column="1" lean-forward="true" selection-start-line="61" selection-start-column="1" selection-end-line="61" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="208" column="49" lean-forward="true" selection-start-line="208" selection-start-column="49" selection-end-line="208" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="140" column="57" selection-start-line="140" selection-start-column="57" selection-end-line="140" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="111" column="36" selection-start-line="111" selection-start-column="36" selection-end-line="111" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="3" lean-forward="true" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="81" column="58" lean-forward="true" selection-start-line="81" selection-start-column="58" selection-end-line="81" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="472">
-          <caret line="118" column="59" selection-start-line="118" selection-start-column="59" selection-end-line="118" selection-end-column="59" />
-          <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-198">
-          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="69" column="32" lean-forward="true" selection-start-line="69" selection-start-column="32" selection-end-line="70" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="142" column="59" lean-forward="true" selection-start-line="142" selection-start-column="59" selection-end-line="142" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="349" column="9" lean-forward="true" selection-start-line="349" selection-start-column="9" selection-end-line="349" selection-end-column="9" />
-          <folding>
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="e#12105#12121#0" expanded="true" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-686">
-          <caret line="67" column="31" lean-forward="true" selection-start-line="67" selection-start-column="31" selection-end-line="67" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="93" column="24" lean-forward="true" selection-start-line="93" selection-start-column="24" selection-end-line="93" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="57" column="23" lean-forward="true" selection-start-line="57" selection-start-column="23" selection-end-line="57" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-408">
-          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="98" column="40" lean-forward="true" selection-start-line="98" selection-start-column="40" selection-end-line="98" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="572">
@@ -925,13 +735,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="328" column="32" lean-forward="true" selection-start-line="328" selection-start-column="32" selection-end-line="328" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
@@ -950,16 +753,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="396">
           <caret line="23" column="32" lean-forward="true" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
-          <folding>
-            <element signature="e#2635#2636#0" expanded="true" />
-            <element signature="e#2671#2672#0" expanded="true" />
-            <element signature="e#2727#2728#0" expanded="true" />
-            <element signature="e#2777#2778#0" expanded="true" />
-            <element signature="e#2877#2878#0" expanded="true" />
-            <element signature="e#2911#2912#0" expanded="true" />
-            <element signature="e#2963#2964#0" expanded="true" />
-            <element signature="e#3009#3010#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -972,14 +765,481 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+        <state relative-caret-position="66">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="59" column="46" lean-forward="true" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3586">
+          <caret line="179" column="16" selection-start-line="179" selection-start-column="16" selection-end-line="179" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5478">
+          <caret line="273" column="3" selection-start-line="273" selection-start-column="3" selection-end-line="273" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1870">
+          <caret line="147" column="11" selection-start-line="147" selection-start-column="11" selection-end-line="147" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="55" column="15" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="106">
+          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="290" column="41" lean-forward="true" selection-start-line="290" selection-start-column="41" selection-end-line="290" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="21" column="32" lean-forward="true" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="550">
+          <caret line="38" column="89" selection-start-line="38" selection-start-column="89" selection-end-line="38" selection-end-column="89" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="11" column="28" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1166">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="818">
+          <caret line="285" column="13" lean-forward="true" selection-start-line="285" selection-start-column="13" selection-end-line="285" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="129" column="31" lean-forward="true" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="323" column="72" lean-forward="true" selection-start-line="323" selection-start-column="72" selection-end-line="323" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="44" column="13" lean-forward="true" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-638">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="244">
+          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="157">
+          <caret line="16" column="55" lean-forward="true" selection-start-line="16" selection-start-column="55" selection-end-line="16" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="270" column="33" lean-forward="true" selection-start-line="270" selection-start-column="33" selection-end-line="270" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="490">
+          <caret line="141" selection-start-line="141" selection-end-line="141" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="164" column="5" lean-forward="true" selection-start-line="164" selection-start-column="5" selection-end-line="164" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/apiTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-242">
+          <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="61" column="16" lean-forward="true" selection-start-line="61" selection-start-column="16" selection-end-line="61" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="700">
+          <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="12" column="34" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="39" column="9" lean-forward="true" selection-start-line="39" selection-start-column="9" selection-end-line="39" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="32" column="29" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="29" />
           <folding>
-            <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-            <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#1838#1839#0" expanded="true" />
+            <element signature="e#1863#1864#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1925#1926#0" expanded="true" />
+            <element signature="e#1822#1823#0" expanded="true" />
+            <element signature="e#1851#1852#0" expanded="true" />
+            <element signature="e#1895#1896#0" expanded="true" />
+            <element signature="e#1931#1932#0" expanded="true" />
+            <element signature="e#2132#2133#0" expanded="true" />
+            <element signature="e#2164#2165#0" expanded="true" />
+            <element signature="e#2214#2215#0" expanded="true" />
+            <element signature="e#2256#2257#0" expanded="true" />
+            <element signature="e#2330#2331#0" expanded="true" />
+            <element signature="e#2370#2371#0" expanded="true" />
+            <element signature="e#2436#2437#0" expanded="true" />
+            <element signature="e#2494#2495#0" expanded="true" />
+            <element signature="e#2569#2570#0" expanded="true" />
+            <element signature="e#2602#2603#0" expanded="true" />
+            <element signature="e#2654#2655#0" expanded="true" />
+            <element signature="e#2698#2699#0" expanded="true" />
+            <element signature="e#2764#2765#0" expanded="true" />
+            <element signature="e#2795#2796#0" expanded="true" />
+            <element signature="e#2843#2844#0" expanded="true" />
+            <element signature="e#2883#2884#0" expanded="true" />
+            <element signature="e#2948#2949#0" expanded="true" />
+            <element signature="e#2980#2981#0" expanded="true" />
+            <element signature="e#3030#3031#0" expanded="true" />
+            <element signature="e#3072#3073#0" expanded="true" />
+            <element signature="e#3134#3135#0" expanded="true" />
+            <element signature="e#3162#3163#0" expanded="true" />
+            <element signature="e#3204#3205#0" expanded="true" />
+            <element signature="e#3238#3239#0" expanded="true" />
+            <element signature="e#3307#3308#0" expanded="true" />
+            <element signature="e#3346#3347#0" expanded="true" />
+            <element signature="e#3410#3411#0" expanded="true" />
+            <element signature="e#3466#3467#0" expanded="true" />
+            <element signature="e#3537#3538#0" expanded="true" />
+            <element signature="e#3567#3568#0" expanded="true" />
+            <element signature="e#3613#3614#0" expanded="true" />
+            <element signature="e#3651#3652#0" expanded="true" />
+            <element signature="e#3721#3722#0" expanded="true" />
+            <element signature="e#3759#3760#0" expanded="true" />
+            <element signature="e#3821#3822#0" expanded="true" />
+            <element signature="e#3875#3876#0" expanded="true" />
+            <element signature="e#3953#3954#0" expanded="true" />
+            <element signature="e#3991#3992#0" expanded="true" />
+            <element signature="e#4053#4054#0" expanded="true" />
+            <element signature="e#4107#4108#0" expanded="true" />
+            <element signature="e#4186#4187#0" expanded="true" />
+            <element signature="e#4225#4226#0" expanded="true" />
+            <element signature="e#4289#4290#0" expanded="true" />
+            <element signature="e#4345#4346#0" expanded="true" />
+            <element signature="e#4430#4431#0" expanded="true" />
+            <element signature="e#4474#4475#0" expanded="true" />
+            <element signature="e#4698#4699#0" expanded="true" />
+            <element signature="e#4740#4741#0" expanded="true" />
+            <element signature="e#4810#4811#0" expanded="true" />
+            <element signature="e#4872#4873#0" expanded="true" />
+            <element signature="e#4955#4956#0" expanded="true" />
+            <element signature="e#4994#4995#0" expanded="true" />
+            <element signature="e#5058#5059#0" expanded="true" />
+            <element signature="e#5114#5115#0" expanded="true" />
+            <element signature="e#5194#5195#0" expanded="true" />
+            <element signature="e#5233#5234#0" expanded="true" />
+            <element signature="e#5297#5298#0" expanded="true" />
+            <element signature="e#5353#5354#0" expanded="true" />
+            <element signature="e#5428#5429#0" expanded="true" />
+            <element signature="e#5462#5463#0" expanded="true" />
+            <element signature="e#5516#5517#0" expanded="true" />
+            <element signature="e#5562#5563#0" expanded="true" />
+            <element signature="e#5634#5635#0" expanded="true" />
+            <element signature="e#5670#5671#0" expanded="true" />
+            <element signature="e#5728#5729#0" expanded="true" />
+            <element signature="e#5778#5779#0" expanded="true" />
+            <element signature="e#5852#5853#0" expanded="true" />
+            <element signature="e#5888#5889#0" expanded="true" />
+            <element signature="e#5946#5947#0" expanded="true" />
+            <element signature="e#5996#5997#0" expanded="true" />
+            <element signature="e#6067#6068#0" expanded="true" />
+            <element signature="e#6100#6101#0" expanded="true" />
+            <element signature="e#6152#6153#0" expanded="true" />
+            <element signature="e#6196#6197#0" expanded="true" />
+            <element signature="e#6261#6262#0" expanded="true" />
+            <element signature="e#6291#6292#0" expanded="true" />
+            <element signature="e#6337#6338#0" expanded="true" />
+            <element signature="e#6375#6376#0" expanded="true" />
+            <element signature="e#6437#6438#0" expanded="true" />
+            <element signature="e#6467#6468#0" expanded="true" />
+            <element signature="e#6513#6514#0" expanded="true" />
+            <element signature="e#6551#6552#0" expanded="true" />
+            <element signature="e#6613#6614#0" expanded="true" />
+            <element signature="e#6643#6644#0" expanded="true" />
+            <element signature="e#6689#6690#0" expanded="true" />
+            <element signature="e#6727#6728#0" expanded="true" />
+            <element signature="e#6796#6797#0" expanded="true" />
+            <element signature="e#6829#6830#0" expanded="true" />
+            <element signature="e#6881#6882#0" expanded="true" />
+            <element signature="e#6925#6926#0" expanded="true" />
+            <element signature="e#6995#6996#0" expanded="true" />
+            <element signature="e#7030#7031#0" expanded="true" />
+            <element signature="e#7086#7087#0" expanded="true" />
+            <element signature="e#7134#7135#0" expanded="true" />
+            <element signature="e#7202#7203#0" expanded="true" />
+            <element signature="e#7233#7234#0" expanded="true" />
+            <element signature="e#7281#7282#0" expanded="true" />
+            <element signature="e#7321#7322#0" expanded="true" />
+            <element signature="e#7390#7391#0" expanded="true" />
+            <element signature="e#7426#7427#0" expanded="true" />
+            <element signature="e#7484#7485#0" expanded="true" />
+            <element signature="e#7534#7535#0" expanded="true" />
+            <element signature="e#7602#7603#0" expanded="true" />
+            <element signature="e#7636#7637#0" expanded="true" />
+            <element signature="e#7690#7691#0" expanded="true" />
+            <element signature="e#7736#7737#0" expanded="true" />
+            <element signature="e#7806#7807#0" expanded="true" />
+            <element signature="e#7840#7841#0" expanded="true" />
+            <element signature="e#7894#7895#0" expanded="true" />
+            <element signature="e#7940#7941#0" expanded="true" />
+            <element signature="e#8006#8007#0" expanded="true" />
+            <element signature="e#8036#8037#0" expanded="true" />
+            <element signature="e#8082#8083#0" expanded="true" />
+            <element signature="e#8120#8121#0" expanded="true" />
+            <element signature="e#8189#8190#0" expanded="true" />
+            <element signature="e#8226#8227#0" expanded="true" />
+            <element signature="e#8286#8287#0" expanded="true" />
+            <element signature="e#8338#8339#0" expanded="true" />
+            <element signature="e#8417#8418#0" expanded="true" />
+            <element signature="e#8457#8458#0" expanded="true" />
+            <element signature="e#8523#8524#0" expanded="true" />
+            <element signature="e#8581#8582#0" expanded="true" />
+            <element signature="e#8655#8656#0" expanded="true" />
+            <element signature="e#8687#8688#0" expanded="true" />
+            <element signature="e#8737#8738#0" expanded="true" />
+            <element signature="e#8779#8780#0" expanded="true" />
+            <element signature="e#8846#8847#0" expanded="true" />
+            <element signature="e#8879#8880#0" expanded="true" />
+            <element signature="e#8931#8932#0" expanded="true" />
+            <element signature="e#8975#8976#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#787#788#0" expanded="true" />
+            <element signature="e#817#818#0" expanded="true" />
+            <element signature="e#2105#2106#0" expanded="true" />
+            <element signature="e#2135#2136#0" expanded="true" />
+            <element signature="e#2431#2432#0" expanded="true" />
+            <element signature="e#2461#2462#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index 854f1f1..0db633a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -165,12 +165,16 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String startDay,String endDay) {
+    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew) {
         try {
 
             Criteria criteria = createCriteria(PgAlarm.class);
             criteria.addOrder(Order.desc("id"));
 
+            if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) {
+                criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
+            }
+
             if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay))
             {
                 criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay)));
@@ -193,9 +197,11 @@
 
                 criteria.add(Restrictions.le("alarmDate",date));
             }
+            if(StringUtils.isNotBlank(isNew)&&isNew.equals("true"))
+                criteria.add(Restrictions.eq("active", 1));
 
             List<PgAlarm> pgAlarmList = criteria.list();
-            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
     }
 
     //根据设备位置(仓位)获取摄像机列表
-    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+    public List<PgDeviceDto> getPgCameraListByPosition(String partition,String position){
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.like("position",position+"%"));
-//        criteria.add(Restrictions.eq("devType","球机"));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(position))
+            criteria.add(Restrictions.like("position",position+"%"));
+
         criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
 
         List<PgDevice> pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
             dto.setDevCode(objects[5].toString());
             dto.setDevType(objects[6].toString());
             if(objects[7]!=null)
-            dto.setIp(objects[7].toString());
+                dto.setIp(objects[7].toString());
             dto.setIsOpen(objects[8].toString());
             dto.setPartition(objects[11].toString());
             dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index 8ebf74d..3c657a7 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgEquipment;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
 import com.casic.PgInterface.devTable.dto.PgEquipmentDto;
@@ -34,9 +35,12 @@
     public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
-        criteria.add(Restrictions.eq("eqName",eqName));
-        criteria.add(Restrictions.eq("eqCode",eqCode));
-        criteria.add(Restrictions.eq("eqType",eqType));
+        if(StringUtils.isNotBlank(eqName))
+            criteria.add(Restrictions.eq("eqName",eqName));
+        if(StringUtils.isNotBlank(eqCode))
+            criteria.add(Restrictions.eq("eqCode",eqCode));
+        if(StringUtils.isNotBlank(eqType))
+            criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
@@ -51,10 +55,9 @@
 
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
-        //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
         String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
-        +eqType+"' group by equipment.EQ_NAME";
+                +eqType+"' group by equipment.EQ_NAME";
 
         List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4ed68e4..e413a5c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
@@ -39,7 +40,8 @@
 
     public List<PgPipeLineDto> getPipeLineByLineType(String lineType) {
         Criteria criteria = createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineType", lineType));
+        if(StringUtils.isNotBlank(lineType))
+            criteria.add(Restrictions.eq("lineType", lineType));
 
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    private Long id;
-    private String keyId;//巡检记录单id
-    private String planId;//巡检计划ID
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    @Column(name="KEY_ID")
-    public String getKeyId() {
-        return keyId;
-    }
-
-    public void setKeyId(String keyId) {
-        this.keyId = keyId;
-    }
-
-    @Column(name="PLAN_ID")
-    public String getPlanId() {
-        return planId;
-    }
-
-    public void setPlanId(String planId) {
-        this.planId = planId;
-    }
-
-    @Column(name="CREATE_DATE")
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    @Column(name="STATE")
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    @Column(name="CREATOR")
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    @Column(name="PLAN_NAME")
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    @Column(name="RECORD_NO")
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    @Column(name="PLAN_NO")
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    @Column(name="RESPONSIBIE_DEPT")
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    @Column(name="INSPECTION_PERSON")
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    @Column(name="PATROL_MAN")
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    @Column(name="OPERATE_DATE")
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    @Column(name="REMARK")
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Column(name="BUILD_CABIN")
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    @Column(name="PROJECT")
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    @Column(name="START_PILE_NO")
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    @Column(name="END_PILE_NO")
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    @Column(name="INSPECTION_PRACE")
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    @Column(name="OTHER_PATROL_MAN")
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private Long id;
+    private String KEY_ID;//唯一键值
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_PERSON;//巡检人
+    private String START_DATE;//巡检开始时间
+    private String END_DATE;
+    private String FREQUENCY;//巡检频率
+    private String STATE;//状态
+    private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+    private String PLAN_NO;//巡检计划编号
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_MODE;//巡检方式
+    private String INSPECTION_ROUTE;//巡检路线
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String INSPECTION_GROUP;//巡检部门
+    private String INSERT_TIME;//插入时间
+    private String FREQUENCYDATE;//巡检具体日期
+    private String FREQUENCYTIME;//巡检具体时间
+    private String CREATEDATE;//创建时间
+    private String CREATOR;//创建人
+    private String PROJECT;//项目
+    private String COMLILE;//编制人
+    private String START_TIME;//编制时间
+    private String DEVELOP_DEPT;//制定部门
+    private String END_TIME;//结束时间
+    private String START_PILE_NO;//开始桩号
+    private String END_PILE_NO;//结束桩号
+    private String BUILD_CABIN;//巡检舱室
+    private String MILEAGE;
+    private String FREQUENCY_TIME;//巡检具体时间
+    private String FREQUENCYTIME_END;
+    private String KETTLE_TS;
+    private String UPDATEDATE;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="KEY_ID")
+    public String getKEY_ID() {
+        return KEY_ID;
+    }
+
+    public void setKEY_ID(String KEY_ID) {
+        this.KEY_ID = KEY_ID;
+    }
+
+    @Column(name="PLAN_NAME")
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    @Column(name="INSPECTION_PERSON")
+    public String getINSPECTION_PERSON() {
+        return INSPECTION_PERSON;
+    }
+
+    public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+        this.INSPECTION_PERSON = INSPECTION_PERSON;
+    }
+
+    @Column(name="START_DATE")
+    public String getSTART_DATE() {
+        return START_DATE;
+    }
+
+    public void setSTART_DATE(String START_DATE) {
+        this.START_DATE = START_DATE;
+    }
+
+    @Column(name="END_DATE")
+    public String getEND_DATE() {
+        return END_DATE;
+    }
+
+    public void setEND_DATE(String END_DATE) {
+        this.END_DATE = END_DATE;
+    }
+
+    @Column(name="FREQUENCY")
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    @Column(name="STATE")
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    @Column(name="RESPONSIBLE_DEPT")
+    public String getRESPONSIBLE_DEPT() {
+        return RESPONSIBLE_DEPT;
+    }
+
+    public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+        this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+    }
+
+    @Column(name="PLAN_NO")
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    @Column(name="INSPECTION_TYPE")
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    @Column(name="INSPECTION_MODE")
+    public String getINSPECTION_MODE() {
+        return INSPECTION_MODE;
+    }
+
+    public void setINSPECTION_MODE(String INSPECTION_MODE) {
+        this.INSPECTION_MODE = INSPECTION_MODE;
+    }
+
+    @Column(name="INSPECTION_ROUTE")
+    public String getINSPECTION_ROUTE() {
+        return INSPECTION_ROUTE;
+    }
+
+    public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+        this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+    }
+
+    @Column(name="INSPECTION_START_TIME")
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    @Column(name="INSPECTION_END_TIME")
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    @Column(name="INSPECTION_PRACE")
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    @Column(name="INSPECTION_GROUP")
+    public String getINSPECTION_GROUP() {
+        return INSPECTION_GROUP;
+    }
+
+    public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+        this.INSPECTION_GROUP = INSPECTION_GROUP;
+    }
+
+    @Column(name="INSERT_TIME")
+    public String getINSERT_TIME() {
+        return INSERT_TIME;
+    }
+
+    public void setINSERT_TIME(String INSERT_TIME) {
+        this.INSERT_TIME = INSERT_TIME;
+    }
+
+    @Column(name="FREQUENCYDATE")
+    public String getFREQUENCYDATE() {
+        return FREQUENCYDATE;
+    }
+
+    public void setFREQUENCYDATE(String FREQUENCYDATE) {
+        this.FREQUENCYDATE = FREQUENCYDATE;
+    }
+
+    @Column(name="FREQUENCYTIME")
+    public String getFREQUENCYTIME() {
+        return FREQUENCYTIME;
+    }
+
+    public void setFREQUENCYTIME(String FREQUENCYTIME) {
+        this.FREQUENCYTIME = FREQUENCYTIME;
+    }
+
+    @Column(name="CREATEDATE")
+    public String getCREATEDATE() {
+        return CREATEDATE;
+    }
+
+    public void setCREATEDATE(String CREATEDATE) {
+        this.CREATEDATE = CREATEDATE;
+    }
+
+    @Column(name="CREATOR")
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    @Column(name="PROJECT")
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    @Column(name="COMLILE")
+    public String getCOMLILE() {
+        return COMLILE;
+    }
+
+    public void setCOMLILE(String COMLILE) {
+        this.COMLILE = COMLILE;
+    }
+
+    @Column(name="START_TIME")
+    public String getSTART_TIME() {
+        return START_TIME;
+    }
+
+    public void setSTART_TIME(String START_TIME) {
+        this.START_TIME = START_TIME;
+    }
+
+    @Column(name="DEVELOP_DEPT")
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    @Column(name="END_TIME")
+    public String getEND_TIME() {
+        return END_TIME;
+    }
+
+    public void setEND_TIME(String END_TIME) {
+        this.END_TIME = END_TIME;
+    }
+
+    @Column(name="START_PILE_NO")
+    public String getSTART_PILE_NO() {
+        return START_PILE_NO;
+    }
+
+    public void setSTART_PILE_NO(String START_PILE_NO) {
+        this.START_PILE_NO = START_PILE_NO;
+    }
+
+    @Column(name="END_PILE_NO")
+    public String getEND_PILE_NO() {
+        return END_PILE_NO;
+    }
+
+    public void setEND_PILE_NO(String END_PILE_NO) {
+        this.END_PILE_NO = END_PILE_NO;
+    }
+
+    @Column(name="BUILD_CABIN")
+    public String getBUILD_CABIN() {
+        return BUILD_CABIN;
+    }
+
+    public void setBUILD_CABIN(String BUILD_CABIN) {
+        this.BUILD_CABIN = BUILD_CABIN;
+    }
+
+    @Column(name="MILEAGE")
+    public String getMILEAGE() {
+        return MILEAGE;
+    }
+
+    public void setMILEAGE(String MILEAGE) {
+        this.MILEAGE = MILEAGE;
+    }
+
+    @Column(name="FREQUENCY_TIME")
+    public String getFREQUENCY_TIME() {
+        return FREQUENCY_TIME;
+    }
+
+    public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+        this.FREQUENCY_TIME = FREQUENCY_TIME;
+    }
+
+    @Column(name="FREQUENCYTIME_END")
+    public String getFREQUENCYTIME_END() {
+        return FREQUENCYTIME_END;
+    }
+
+    public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+        this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+    }
+
+    @Column(name="KETTLE_TS")
+    public String getKETTLE_TS() {
+        return KETTLE_TS;
+    }
+
+    public void setKETTLE_TS(String KETTLE_TS) {
+        this.KETTLE_TS = KETTLE_TS;
+    }
+
+    @Column(name="UPDATEDATE")
+    public String getUPDATEDATE() {
+        return UPDATEDATE;
+    }
+
+    public void setUPDATEDATE(String UPDATEDATE) {
+        this.UPDATEDATE = UPDATEDATE;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 5346b57..2f8d359 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -66,7 +66,7 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REPAIRMAN")
+    @Column(name="REOAIRMAN")
     public String getRepairMan() {
         return repairMan;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
-    private Long id;
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-
-
-    public static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
-        PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
-        pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
-        pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
-        pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
-        pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
-        pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
-        pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
-        pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
-        pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
-        pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
-        pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
-        pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
-        pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
-        pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
-        pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
-        return pgAssetInSpectionRecordDto;
-    }
-
-
-    public static List<PgAssetInSpectionRecordDto> ConvertToDtoList(List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList){
-        List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-        for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
-            pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
-        }
-
-        return pgAssetInSpectionRecordDtoList;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
-    private String num;
-    private String createDate;
-
-    public String getNum() {
-        return num;
-    }
-
-    public void setNum(String num) {
-        this.num = num;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+    private Long id;
+    private String PLAN_NO;//巡检计划编号
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String FREQUENCY;//巡检频率
+    private String CREATOR;//创建人
+    private String DEVELOP_DEPT;//制定部门
+    private String PROJECT;//项目
+    private String STATE;//状态
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+        PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+        pgAssetPlanDto.setId(pgAssetPlan.getId());
+        pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+        pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+        pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+        pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+        pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+        pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+        pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+        pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+        pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+        pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+        pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+        return pgAssetPlanDto;
+    }
+
+    public static List<PgAssetPlanDto> ConvertToPgAssetDtoList(List<PgAssetPlan> pgAssetPlanList){
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
+
+        for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+            pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+        }
+
+        return pgAssetPlanDtoList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
new file mode 100644
index 0000000..bc12db1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
@@ -0,0 +1,24 @@
+package com.casic.PgInterface.maintenance.dto;
+
+public class PgAssetPlanStatic {
+
+    private String num;
+    private String createDate;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
deleted file mode 100644
index c41ca7d..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.casic.PgInterface.maintenance.manager;
-
-import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
-
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
-        try {
-            String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
-                    "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
-                    "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-
-            if(patrolMan!=null)
-                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
-            if(startTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
-            if(endTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')<to_date('"+endTime+"','yyyy-MM-dd')";
-
-            sql+=" order by id";
-
-            List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
-
-            List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList=new ArrayList<>();
-            for(Object[] objects1:objects){
-                PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord();
-
-                pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString()));
-                pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1]));
-                pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2]));
-                pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3]));
-                pgAssetInSpectionRecord.setState(String.valueOf(objects1[4]));
-                pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5]));
-                pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6]));
-                pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7]));
-                pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8]));
-                pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9]));
-                pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10]));
-                pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11]));
-                pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12]));
-                pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13]));
-                pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14]));
-                pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15]));
-                pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16]));
-                pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17]));
-                pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18]));
-                pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19]));
-
-                pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord);
-            }
-
-            List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-            for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList)
-            {
-                pgAssetInSpectionRecordDtoList.add(PgAssetInSpectionRecordDto.ConvertToDto(pgAssetInSpectionRecord));
-            }
-
-            return pgAssetInSpectionRecordDtoList;
-        }
-        catch(Exception e)
-        {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public List<PgAssetInSpectionRecordStatic> getPgAssetInSpectionRecordStaticLisByTime(
-            String startTime, String endTime, String staticType) {
-
-        String sql="";
-        String dateType="";
-        List<PgAssetInSpectionRecordStatic> pgAssetInSpectionRecordStaticList=new ArrayList<>();
-        int type=Integer.valueOf(staticType);
-
-        switch(type) {
-            case 0://年
-                dateType = "yyyy";
-                break;
-            case 1://月
-                dateType = "yyyy-mm";
-                break;
-            case 2://周
-                dateType = "iw";
-                break;
-            case 3://日
-                dateType="yyyy-mm-dd";
-                break;
-            default:
-                break;
-        }
-
-        sql="select count(*), to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_RECORD t where 1=1";
-
-        if(startTime!=null)
-            sql+=" and t.CREATE_DATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
-        if(endTime!=null)
-            sql+=" and t.CREATE_DATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
-
-        sql+=" group by to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"')";
-
-        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
-        for(int i=0;i<objects.size();i++)
-        {
-            PgAssetInSpectionRecordStatic pgAssetInSpectionRecordStatic=new PgAssetInSpectionRecordStatic();
-            pgAssetInSpectionRecordStatic.setNum(objects.get(i)[0].toString());
-            pgAssetInSpectionRecordStatic.setCreateDate(objects.get(i)[1].toString());
-            pgAssetInSpectionRecordStaticList.add(pgAssetInSpectionRecordStatic);
-        }
-        return pgAssetInSpectionRecordStaticList;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
new file mode 100644
index 0000000..bb6bf1e
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
@@ -0,0 +1,81 @@
+package com.casic.PgInterface.maintenance.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgAssetPlanManager extends HibernateEntityDao<PgAssetPlan> {
+
+    public List<PgAssetPlanDto> getPgAssetPlanDtoList(String inSpectionPlace){
+        Criteria criteria=createCriteria(PgAssetPlan.class);
+
+        if(StringUtils.isNotBlank(inSpectionPlace))
+            criteria.add(Restrictions.like("INSPECTION_PRACE","%"+inSpectionPlace+"%"));
+        criteria.addOrder(Order.desc("id"));
+
+        List<PgAssetPlan> pgAssetPlanList=criteria.list();
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=PgAssetPlanDto.ConvertToPgAssetDtoList(pgAssetPlanList);
+
+        if(pgAssetPlanDtoList==null||pgAssetPlanDtoList.size()==0)
+            return null;
+        else
+            return pgAssetPlanDtoList;
+    }
+
+    public List<PgAssetPlanStatic> getPgAssetPlanStaticLisByTime(
+            String startTime, String endTime, String staticType) {
+
+        String sql="";
+        String dateType="";
+        List<PgAssetPlanStatic> pgAssetPlanStaticList=new ArrayList<>();
+        int type=Integer.valueOf(staticType);
+
+        switch(type) {
+            case 0://年
+                dateType = "yyyy";
+                break;
+            case 1://月
+                dateType = "yyyy-mm";
+                break;
+            case 2://周
+                dateType = "iw";
+                break;
+            case 3://日
+                dateType="yyyy-mm-dd";
+                break;
+            default:
+                break;
+        }
+
+        sql="select count(*), to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_PLAN t where 1=1";
+
+        if(startTime!=null)
+            sql+=" and t.CREATEDATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
+        if(endTime!=null)
+            sql+=" and t.CREATEDATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
+
+        sql+=" group by to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"')";
+
+        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
+        for(int i=0;i<objects.size();i++)
+        {
+            PgAssetPlanStatic pgAssetPlanStatic=new PgAssetPlanStatic();
+            pgAssetPlanStatic.setNum(objects.get(i)[0].toString());
+            pgAssetPlanStatic.setCreateDate(objects.get(i)[1].toString());
+            pgAssetPlanStaticList.add(pgAssetPlanStatic);
+        }
+        return pgAssetPlanStaticList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 0903f22..3484739 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -15,7 +15,7 @@
 
     public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
             if(repairMan!=null)
                 sql+=" and REPAIRMAN like '%"+repairMan+"%'";
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index 9cc2881..6d90d7b 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -1,5 +1,7 @@
 package com.casic.PgInterface.patroler.dto;
 
+import com.casic.PgInterface.devTable.domain.PgDevice;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 
 /**
@@ -14,6 +16,7 @@
     private String unit;//单位
     private String alarmType;//报警类型
     private Long pgDeviceId;//设备编号
+    private String assetCode;//资产编号
 
     public Long getId() {
         return id;
@@ -71,7 +74,15 @@
         this.pgDeviceId = pgDeviceId;
     }
 
-    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
+    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule, PgDeviceManager pgDeviceManager) {
         this.setId(pgAlarmRule.getId());
         this.setHighValue(pgAlarmRule.getHighValue());
         this.setLowValue(pgAlarmRule.getLowValue());
@@ -82,6 +93,10 @@
         else
             this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
         this.setPgDeviceId(pgAlarmRule.getPgDeviceId());
+        if(pgAlarmRule.getAlarmTypeId()!=null&&pgDeviceManager.get(pgAlarmRule.getPgDeviceId())!=null)
+            this.setAssetCode(pgDeviceManager.get(pgAlarmRule.getPgDeviceId()).getAssetCode());
+        else
+            this.setAssetCode("");
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
index c132c98..a7cef5b 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
@@ -1,13 +1,17 @@
 package com.casic.PgInterface.patroler.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.ResponseStatus;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -17,30 +21,23 @@
 @Service
 public class PgAlarmRuleManager extends HibernateEntityDao<PgAlarmRule> {
 
+    @Resource
+    private PgDeviceManager pgDeviceManager;
+
     //根据设备获取设备报警阈值
-    public List<PgAlarmRuleDto>  getAlarmRuleDto() {
+    public List<PgAlarmRuleDto>  getAlarmRuleDto(String devType) {
         Criteria criteria=createCriteria(PgAlarmRule.class);
+
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.eq("devType", devType));
         criteria.addOrder(Order.desc("id"));
 
         List<PgAlarmRule> pgAlarmRuleList=criteria.list();
-        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
+        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         for (PgAlarmRule pgAlarmRule : pgAlarmRuleList) {
-            pgAlarmRuleDtoList.add(new PgAlarmRuleDto(pgAlarmRule));
+            pgAlarmRuleDtoList.add(new PgAlarmRuleDto(pgAlarmRule,pgDeviceManager));
         }
         return pgAlarmRuleDtoList;
-
     }
 
-    public PgAlarmRule getAlarmRuleBydevType(String devType) {
-        Criteria criteria=createCriteria(PgAlarmRule.class);
-        criteria.add(Restrictions.eq("devType", devType));
-
-        List<PgAlarmRule> pgAlarmRuleList=criteria.list();
-
-        if(pgAlarmRuleList==null||pgAlarmRuleList.size()==0)
-            return null;
-        else
-            return pgAlarmRuleList.get(0);
-    }
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index d0e28f5..082ba5d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgAlarm;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
@@ -39,7 +40,7 @@
     private PgReservePlanManager pgReservePlanManager;
 
     /*
-    * 获取报警设备信息
+     * 获取报警设备信息
      */
     @POST
     @Path("linkDevice")
@@ -50,11 +51,22 @@
 
         PgDeviceDto pgDeviceDto = null;
         try {
-            PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
-            PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
-
-            pgDeviceDto=new PgDeviceDto(pgDevice);
-            msg = "报警关联设备获取成功";
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if (pgAlarm == null)
+                    msg = "不存在报警信息";
+                else {
+                    PgDevice pgDevice = pgAlarm.getAlarmDevId();
+                    if (pgDevice == null)
+                        msg = "不存在报警设备";
+                    else {
+                        pgDeviceDto = new PgDeviceDto(pgDevice);
+                        msg = "报警关联设备获取成功";
+                    }
+                }
+            }
+            else
+                msg="未接受到报警设备ID信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取关联设备失败";
@@ -77,11 +89,28 @@
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
-            PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
-            PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
-            pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if(pgAlarm==null)
+                    msg="不存在报警信息";
+                else {
+                    PgDevice pgDevice = pgAlarm.getAlarmDevId();
+                    if (pgDevice == null)
+                        msg = "不存在报警设备";
+                    else {
+                        String strPosition=pgDevice.getPosition();
+                        String position="";
+                        if(!strPosition.equals(""))
+                            position=pgDevice.getPosition().substring(0,3);
+                        String partition=pgDevice.getPartition();
 
-            msg = "关联设备获取成功";
+                        pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
+                        msg = "关联设备获取成功";
+                    }
+                }
+            }
+            else
+                msg="请输入报警设备Id信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "分区设备关联失败";
@@ -93,7 +122,7 @@
 
     /*
      * 根据报警记录获取关联的预案
-    */
+     */
     @POST
     @Path("linkReservePlan")
     @Produces(MediaType.APPLICATION_JSON)
@@ -103,10 +132,21 @@
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
-            PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
-            pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if (pgAlarm == null)
+                    msg = "不存在报警信息";
+                else {
+                    pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-            msg="关联预案获取成功";
+                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
+                        msg="不存在关联的报警预案";
+                    else
+                        msg = "关联预案获取成功";
+                }
+            }
+            else
+                msg="请输入报警信息";
         }
         catch(Exception e)
         {
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index d18ebb8..baacd93 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -48,14 +48,16 @@
     @POST
     @Path("getAlarmInfo")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmList(@FormParam("startDay") String startDay,
-                                            @FormParam("endDay") String endDay) throws Exception {
+    public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
+                                            @FormParam("startDay") String startDay,
+                                            @FormParam("endDay") String endDay,
+                                            @FormParam("isNew") String isNew) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(startDay,endDay);
-            if (pgAlarmDtoList.size() == 0)
+            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew);
+            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
                 msg = "没有报警信息";
             else
                 msg = "报警信息获取成功";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 87afd54..29ce8a4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -1,7 +1,5 @@
 package com.casic.PgInterface.rs;
 
-import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager;
-import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import com.casic.PgInterface.patroler.manager.PgAlarmRuleManager;
@@ -30,119 +28,23 @@
     private static Logger logger = LoggerFactory.getLogger(PgAlarmRule.class);
 
     @Resource
-    private PgDeviceManager pgDeviceManager;
-    @Resource
-    private PgAlarmTypeManager pgAlarmTypeManager;
-    @Resource
     private PgAlarmRuleManager pgAlarmRuleManager;
 
-
-
-    /**
-     * 新增报警阈值
-     */
-    @POST
-    @Path("addAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> addAlarmRule(@FormParam("highValue") String highValue,
-                                            @FormParam("lowValue") String lowValue,
-                                            @FormParam("unit") String unit,
-                                            @FormParam("devType") String devType,
-                                            @FormParam("alarmType") String alarmType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType);
-            if (pgAlarmRule != null) {
-                result = "false";
-                msg = "设备阈值已经存在";
-            } else {
-                pgAlarmRule = new PgAlarmRule();
-                pgAlarmRule.setHighValue(highValue);
-                pgAlarmRule.setLowValue(lowValue);
-                pgAlarmRule.setDevType(devType);
-                pgAlarmRule.setUnit(unit);
-                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
-
-                pgAlarmRuleManager.save(pgAlarmRule);
-                result = "true";
-                msg = "报警阈值新增成功";
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = "false";
-            msg = "报警阈值新增失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-        return resultMap;
-    }
-
-    /**
-     * 编辑报警阈值
-     */
-    @POST
-    @Path("editAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> editAlarmRule(@FormParam("id") String id,
-                                             @FormParam("devType") String devType,
-                                             @FormParam("highValue") String highValue,
-                                             @FormParam("lowValue") String lowValue,
-                                             @FormParam("unit") String unit,
-                                             @FormParam("alarmType") String alarmType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
-            if (pgAlarmRule == null) {
-                msg = "不存在报警阈值记录";
-                result = "false";
-            } else {
-                pgAlarmRule.setDevType(devType);
-                pgAlarmRule.setHighValue(highValue);
-                pgAlarmRule.setLowValue(lowValue);
-                pgAlarmRule.setUnit(unit);
-                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
-
-                pgAlarmRuleManager.save(pgAlarmRule);
-                msg = "编辑成功";
-                result = "true";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            result = "false";
-            msg = "报警阈值编辑失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-
-        return resultMap;
-    }
-
     /**
      * 获取报警阈值信息
      */
     @POST
     @Path("getAlarmRule")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmRule() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+    public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
+        System.out.println("devType:"+devType);
+        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
-            pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto();
-            if (pgAlarmRuleDtoList == null)
+            pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
+            if (pgAlarmRuleDtoList == null||pgAlarmRuleDtoList.size()==0)
                 msg = "不存在报警阈值信息";
             else
                 msg = "报警阈值获取成功";
@@ -155,69 +57,4 @@
         return resultMap;
     }
 
-    /**
-     * 删除报警阈值
-     */
-    @POST
-    @Path("deleteAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> deleteAlarmRule(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
-            if (pgAlarmRule == null) {
-                msg = "不存在报警阈值记录";
-                result = "false";
-            } else {
-                pgAlarmRuleManager.remove(pgAlarmRule);
-                msg = "删除成功";
-                result = "true";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            result = "false";
-            msg = "报警阈值删除失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-
-        return resultMap;
-    }
-
-    /**
-     * 根据设备类型报警阈值
-     */
-    @POST
-    @Path("getAlarmRuleByDevType")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmRuleByDevType(@FormParam("devType") String devType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        PgAlarmRule pgAlarmRule = null;
-        List<PgAlarmRuleDto> pgAlarmRuleDtos = new ArrayList<>();
-        try {
-            pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType);
-            if (pgAlarmRule == null)
-                msg = "不存在报警阈值记录";
-            else {
-                PgAlarmRuleDto pgAlarmRuleDto= new PgAlarmRuleDto(pgAlarmRule);
-                pgAlarmRuleDtos.add(pgAlarmRuleDto);
-                msg = "报警阈值获取成功";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            msg = "报警阈值获取失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmRuleDtos);
-
-        return resultMap;
-    }
-
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
new file mode 100644
index 0000000..19d3b8c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanRs")
+public class PgAssetPlanRs {
+
+    @Resource
+    private PgAssetPlanManager pgAssetPlanManager;
+
+    /**
+     * 获取巡检记录
+     */
+    @POST
+    @Path("getPgAssetPlanList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPgAssetPlanList(@FormParam("inSpectionPlace") String inSpectionPlace){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
+        try{
+            pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(inSpectionPlace);
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
+                msg="巡检信息获取成功";
+            else
+                msg="不存在巡检信息";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="巡检信息获取失败";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAssetPlanDtoList);
+
+        return resultMap;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
new file mode 100644
index 0000000..47ef9d1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanStaticRs")
+public class PgAssetPlanStaticRs {
+
+    @Resource
+    private PgAssetPlanManager pgAssetPlanManager;
+
+    @POST
+    @Path("getPgAssetPlanStaticList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPgAssetPlanStaticList(@FormParam("startTime") String startTime,
+                                                       @FormParam("endTime") String endTime,
+                                                       @FormParam("staticType") String staticType) throws Exception{
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
+        try{
+            pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
+                msg="巡检统计信息获取成功";
+            else
+                msg="统计信息获取失败";
+        }
+        catch (Exception ex){
+            ex.printStackTrace();
+            msg="统计失败";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAssetPlanStaticList);
+
+        return resultMap;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
deleted file mode 100644
index 66f4d09..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.manager.PgAssetInSpectionRecordManager;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@Path("pgAssetRecordRs")
-public class PgAssetRecordRs {
-
-    @Resource
-    private PgAssetInSpectionRecordManager pgAssetInSpectionRecordManager;
-
-    /**
-     * 获取巡检记录
-     */
-    @POST
-    @Path("getPgAssetRecordList")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgAssetRecordList(@FormParam("patrolMan") String patrolMan,
-                                                   @FormParam("startTime") String startTime,
-                                                   @FormParam("endTime") String endTime){
-        Map<String,Object> resultMap=new HashMap<>();
-        String msg="";
-
-        List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-        try{
-            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(patrolMan,startTime,endTime);
-            if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0)
-                msg="巡检信息获取成功";
-            else
-                msg="不存在巡检信息";
-        }
-        catch(Exception ex){
-            ex.printStackTrace();
-            msg="巡检信息获取失败";
-        }
-
-        resultMap.put("msg",msg);
-        resultMap.put("result",pgAssetInSpectionRecordDtoList);
-
-        return resultMap;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java
deleted file mode 100644
index 5f0417a..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import com.casic.PgInterface.maintenance.manager.PgAssetInSpectionRecordManager;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@Path("pgAssetRecordStaticRs")
-public class PgAssetRecordStaticRs {
-
-    @Resource
-    private PgAssetInSpectionRecordManager pgAssetInSpectionRecordManager;
-
-    @POST
-    @Path("getPgAssetRecordHeadStaticList")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgAssetRecordHeadStaticList(@FormParam("startTime") String startTime,
-                                                                @FormParam("endTime") String endTime,
-                                                                @FormParam("staticType") String staticType) throws Exception{
-        Map<String,Object> resultMap=new HashMap<>();
-        String msg="";
-        String result="";
-
-        List<PgAssetInSpectionRecordStatic> pgAssetInSpectionRecordStaticList = null;
-        try{
-            pgAssetInSpectionRecordStaticList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetInSpectionRecordStaticList!=null&&pgAssetInSpectionRecordStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
-            else
-                msg="统计信息获取失败";
-        }
-        catch (Exception ex){
-            ex.printStackTrace();
-            msg="统计失败";
-        }
-
-        resultMap.put("msg",msg);
-        resultMap.put("result",pgAssetInSpectionRecordStaticList);
-
-        return resultMap;
-    }
-
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index 9dfdd88..a0245ba 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -326,7 +326,7 @@
 
             PgConstruction pgConstruction=pgConstructionManager.get(Long.valueOf(id));
 
-            pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(pgConstruction.getPgName());
+            pgDeviceDtoList=pgDeviceManager.getPgCameraListByPartition(pgConstruction.getPgName());
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index 1c8130c..c276fb3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -177,6 +177,7 @@
             else
             {
                 pgEquipment.setActive(0);
+                pgEquipmentManager.save(pgEquipment);
                 msg="删除成功";
                 result="true";
             }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index 486b49f..f0b936c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -287,7 +287,7 @@
         try {
             if (apCode != "") {
                 String apCodeStr=apCode.substring(0,3);
-                pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(apCodeStr);
+                pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition("",apCodeStr);
                 if(pgDeviceDtoList==null)
                     msg="不存在关联摄像机";
                 else
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 982e3d9..a6da81e 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -11,15 +11,13 @@
 
 
 # ============================================================================
-# dbd
+# db
 # ============================================================================
 db.default.driverClassName=oracle.jdbc.driver.OracleDriver
-db.default.url=jdbc:oracle:thin:@172.17.0.201:1521:szgl
-#db.default.url=jdbc:oracle:thin:@119.254.103.80:1521:chengdu
-db.default.username=scott
-db.default.password=scott
-#db.default.username=PG
-#db.default.password=PG
+#db.default.url=jdbc:oracle:thin:@172.17.0.201:1521:szgl
+db.default.url=jdbc:oracle:thin:@119.254.103.80:1521:chengdu
+db.default.username=PG
+db.default.password=PG
 
 
 # ============================================================================
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190828.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190828.docx"
new file mode 100644
index 0000000..7920004
--- /dev/null
+++ "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190828.docx"
Binary files differ

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ff69e2a..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,27 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190828.docx" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -32,72 +42,119 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="2" />
-          <entry key="java" value="243" />
-          <entry key="properties" value="6" />
+          <entry key="java" value="321" />
+          <entry key="properties" value="8" />
           <entry key="xml" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
-          <entry key="JAVA" value="243" />
-          <entry key="Properties" value="6" />
+          <entry key="JAVA" value="321" />
+          <entry key="Properties" value="8" />
           <entry key="XML" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="8082" />
-          <entry key="properties" value="49" />
-          <entry key="txt" value="64" />
+          <entry key="dummy" value="16" />
+          <entry key="java" value="10723" />
+          <entry key="properties" value="59" />
+          <entry key="txt" value="118" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="8082" />
-          <entry key="PLAIN_TEXT" value="64" />
-          <entry key="Properties" value="49" />
+          <entry key="JAVA" value="10723" />
+          <entry key="PLAIN_TEXT" value="134" />
+          <entry key="Properties" value="59" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="4" />
+          <entry key="project.closed" value="28" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
           <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.24" value="1" />
+          <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="1" />
-          <entry key="project.open.time.3" value="3" />
-          <entry key="project.open.time.31" value="1" />
+          <entry key="project.open.time.28" value="1" />
+          <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.31" value="2" />
           <entry key="project.open.time.37" value="1" />
+          <entry key="project.open.time.39" value="2" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.40" value="1" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="1" />
+          <entry key="project.open.time.44" value="2" />
           <entry key="project.open.time.45" value="2" />
           <entry key="project.open.time.48" value="1" />
           <entry key="project.open.time.49" value="1" />
+          <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.58" value="1" />
           <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.71" value="1" />
+          <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.71" value="2" />
           <entry key="project.open.time.76" value="1" />
-          <entry key="project.opened" value="25" />
+          <entry key="project.opened" value="41" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+            <state relative-caret-position="174">
+              <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
               <folding>
-                <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-                <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="352">
+              <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#787#788#0" expanded="true" />
+                <element signature="e#817#818#0" expanded="true" />
+                <element signature="e#2105#2106#0" expanded="true" />
+                <element signature="e#2135#2136#0" expanded="true" />
+                <element signature="e#2431#2432#0" expanded="true" />
+                <element signature="e#2461#2462#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="638">
+              <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+              <folding>
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -122,6 +179,7 @@
       <find>getPgDeviceByDevType</find>
       <find>message</find>
       <find>getConstructionByType</find>
+      <find>getPgCameraListByPosition</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -130,24 +188,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanTypeDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
@@ -162,17 +207,38 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
       </list>
     </option>
   </component>
@@ -208,16 +274,18 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="3" />
-    <option name="y" value="10" />
-    <option name="width" value="1386" />
-    <option name="height" value="788" />
+    <option name="x" value="1410" />
+    <option name="y" value="117" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -258,7 +326,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -267,16 +335,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -286,7 +345,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="dto" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -296,7 +355,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="manager" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -308,19 +367,10 @@
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="webapp" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -359,6 +409,7 @@
       </deployment>
       <server-settings>
         <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_7" />
+        <option name="JNDI_PORT" value="10991" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -456,7 +507,23 @@
       <workItem from="1566350810712" duration="6803000" />
       <workItem from="1566435787074" duration="10717000" />
       <workItem from="1566521753529" duration="14265000" />
-      <workItem from="1566614176989" duration="5693000" />
+      <workItem from="1566614176989" duration="14059000" />
+      <workItem from="1566780822009" duration="1026000" />
+      <workItem from="1566891563975" duration="284000" />
+      <workItem from="1566893107340" duration="3382000" />
+      <workItem from="1566953794976" duration="11039000" />
+      <workItem from="1567059357700" duration="484000" />
+      <workItem from="1567082835097" duration="1086000" />
+      <workItem from="1567126428020" duration="1539000" />
+      <workItem from="1567129277820" duration="5788000" />
+      <workItem from="1567136008996" duration="2568000" />
+      <workItem from="1567237040302" duration="111000" />
+      <workItem from="1567495626345" duration="2797000" />
+      <workItem from="1567558770152" duration="2352000" />
+      <workItem from="1567577368149" duration="640000" />
+      <workItem from="1567751224608" duration="780000" />
+      <workItem from="1568019299799" duration="695000" />
+      <workItem from="1568082566133" duration="4016000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -493,17 +560,60 @@
       <option name="project" value="LOCAL" />
       <updated>1566553388171</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="整理管线部分">
+      <created>1566620046627</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1566620046627</updated>
+    </task>
+    <task id="LOCAL-00007" summary="合并代码提交">
+      <created>1566781001910</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1566781001910</updated>
+    </task>
+    <task id="LOCAL-00008" summary="合并代码提交">
+      <created>1566963831930</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1566963831930</updated>
+    </task>
+    <task id="LOCAL-00009" summary="修改报警阈值">
+      <created>1566972146710</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1566972146710</updated>
+    </task>
+    <task id="LOCAL-00010" summary="修改巡检维护表字段">
+      <created>1567126525554</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1567126525554</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="142930000" />
+    <option name="totallyTimeSpent" value="189883000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
+    <frame x="1358" y="-8" width="1456" height="916" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29297996" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -511,13 +621,14 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Thumbnails" weight="0.3295082" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.5081967" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.3849105" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
       <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
       <window_info anchor="bottom" id="Spring" order="8" />
       <window_info anchor="bottom" id="Terminal" order="9" />
@@ -539,7 +650,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2193646" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -547,22 +658,23 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.47540984" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
-      <window_info anchor="bottom" id="Spring" order="8" />
-      <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
-      <window_info anchor="bottom" id="Statistic" order="11" />
-      <window_info anchor="bottom" id="Java Enterprise" order="12" />
-      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="14" weight="0.32786885" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.52307695" />
+      <window_info anchor="bottom" id="Thumbnails" order="0" weight="0.3295082" />
+      <window_info anchor="bottom" id="Message" order="1" />
+      <window_info anchor="bottom" id="Find" order="2" />
+      <window_info anchor="bottom" id="Run" order="3" />
+      <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.49924356" weight="0.49344262" />
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Application Servers" order="8" weight="0.3276923" />
+      <window_info anchor="bottom" id="Spring" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
+      <window_info anchor="bottom" id="Statistic" order="12" />
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <window_info anchor="bottom" id="Database Changes" order="14" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="15" weight="0.32786885" />
+      <window_info anchor="bottom" id="Messages" order="16" weight="0.5229508" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -578,6 +690,16 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -587,7 +709,11 @@
     <MESSAGE value="修改权限问题" />
     <MESSAGE value="修改人员登录返回接口" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整理管线部分" />
+    <MESSAGE value="合并代码提交" />
+    <MESSAGE value="修改报警阈值" />
+    <MESSAGE value="修改巡检维护表字段" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护表字段" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -602,322 +728,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-532">
-          <caret line="50" column="28" lean-forward="true" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="19" column="60" selection-start-line="19" selection-start-column="60" selection-end-line="19" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="100" column="34" lean-forward="true" selection-start-line="100" selection-start-column="34" selection-end-line="100" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1474">
-          <caret line="84" column="58" selection-start-line="84" selection-start-column="58" selection-end-line="84" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1100">
-          <caret line="58" column="18" selection-start-line="58" selection-start-column="18" selection-end-line="58" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6842">
-          <caret line="329" selection-start-line="329" selection-end-line="329" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="102" column="24" lean-forward="true" selection-start-line="102" selection-start-column="24" selection-end-line="102" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="72" column="56" lean-forward="true" selection-start-line="72" selection-start-column="56" selection-end-line="72" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="90" column="39" lean-forward="true" selection-start-line="90" selection-start-column="39" selection-end-line="90" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="97" column="16" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
-          <caret line="14" column="52" lean-forward="true" selection-start-line="14" selection-start-column="52" selection-end-line="14" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="26" column="34" lean-forward="true" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="61" column="1" lean-forward="true" selection-start-line="61" selection-start-column="1" selection-end-line="61" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="208" column="49" lean-forward="true" selection-start-line="208" selection-start-column="49" selection-end-line="208" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="140" column="57" selection-start-line="140" selection-start-column="57" selection-end-line="140" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="111" column="36" selection-start-line="111" selection-start-column="36" selection-end-line="111" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="3" lean-forward="true" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="81" column="58" lean-forward="true" selection-start-line="81" selection-start-column="58" selection-end-line="81" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="472">
-          <caret line="118" column="59" selection-start-line="118" selection-start-column="59" selection-end-line="118" selection-end-column="59" />
-          <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-198">
-          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="69" column="32" lean-forward="true" selection-start-line="69" selection-start-column="32" selection-end-line="70" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="142" column="59" lean-forward="true" selection-start-line="142" selection-start-column="59" selection-end-line="142" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="349" column="9" lean-forward="true" selection-start-line="349" selection-start-column="9" selection-end-line="349" selection-end-column="9" />
-          <folding>
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="e#12105#12121#0" expanded="true" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-686">
-          <caret line="67" column="31" lean-forward="true" selection-start-line="67" selection-start-column="31" selection-end-line="67" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="93" column="24" lean-forward="true" selection-start-line="93" selection-start-column="24" selection-end-line="93" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="57" column="23" lean-forward="true" selection-start-line="57" selection-start-column="23" selection-end-line="57" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-408">
-          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="98" column="40" lean-forward="true" selection-start-line="98" selection-start-column="40" selection-end-line="98" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="572">
@@ -925,13 +735,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="328" column="32" lean-forward="true" selection-start-line="328" selection-start-column="32" selection-end-line="328" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
@@ -950,16 +753,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="396">
           <caret line="23" column="32" lean-forward="true" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
-          <folding>
-            <element signature="e#2635#2636#0" expanded="true" />
-            <element signature="e#2671#2672#0" expanded="true" />
-            <element signature="e#2727#2728#0" expanded="true" />
-            <element signature="e#2777#2778#0" expanded="true" />
-            <element signature="e#2877#2878#0" expanded="true" />
-            <element signature="e#2911#2912#0" expanded="true" />
-            <element signature="e#2963#2964#0" expanded="true" />
-            <element signature="e#3009#3010#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -972,14 +765,481 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+        <state relative-caret-position="66">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="59" column="46" lean-forward="true" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3586">
+          <caret line="179" column="16" selection-start-line="179" selection-start-column="16" selection-end-line="179" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5478">
+          <caret line="273" column="3" selection-start-line="273" selection-start-column="3" selection-end-line="273" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1870">
+          <caret line="147" column="11" selection-start-line="147" selection-start-column="11" selection-end-line="147" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="55" column="15" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="106">
+          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="290" column="41" lean-forward="true" selection-start-line="290" selection-start-column="41" selection-end-line="290" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="21" column="32" lean-forward="true" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="550">
+          <caret line="38" column="89" selection-start-line="38" selection-start-column="89" selection-end-line="38" selection-end-column="89" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="11" column="28" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1166">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="818">
+          <caret line="285" column="13" lean-forward="true" selection-start-line="285" selection-start-column="13" selection-end-line="285" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="129" column="31" lean-forward="true" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="323" column="72" lean-forward="true" selection-start-line="323" selection-start-column="72" selection-end-line="323" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="44" column="13" lean-forward="true" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-638">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="244">
+          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="157">
+          <caret line="16" column="55" lean-forward="true" selection-start-line="16" selection-start-column="55" selection-end-line="16" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="270" column="33" lean-forward="true" selection-start-line="270" selection-start-column="33" selection-end-line="270" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="490">
+          <caret line="141" selection-start-line="141" selection-end-line="141" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="164" column="5" lean-forward="true" selection-start-line="164" selection-start-column="5" selection-end-line="164" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/apiTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-242">
+          <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="61" column="16" lean-forward="true" selection-start-line="61" selection-start-column="16" selection-end-line="61" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="700">
+          <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="12" column="34" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="39" column="9" lean-forward="true" selection-start-line="39" selection-start-column="9" selection-end-line="39" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="32" column="29" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="29" />
           <folding>
-            <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-            <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#1838#1839#0" expanded="true" />
+            <element signature="e#1863#1864#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1925#1926#0" expanded="true" />
+            <element signature="e#1822#1823#0" expanded="true" />
+            <element signature="e#1851#1852#0" expanded="true" />
+            <element signature="e#1895#1896#0" expanded="true" />
+            <element signature="e#1931#1932#0" expanded="true" />
+            <element signature="e#2132#2133#0" expanded="true" />
+            <element signature="e#2164#2165#0" expanded="true" />
+            <element signature="e#2214#2215#0" expanded="true" />
+            <element signature="e#2256#2257#0" expanded="true" />
+            <element signature="e#2330#2331#0" expanded="true" />
+            <element signature="e#2370#2371#0" expanded="true" />
+            <element signature="e#2436#2437#0" expanded="true" />
+            <element signature="e#2494#2495#0" expanded="true" />
+            <element signature="e#2569#2570#0" expanded="true" />
+            <element signature="e#2602#2603#0" expanded="true" />
+            <element signature="e#2654#2655#0" expanded="true" />
+            <element signature="e#2698#2699#0" expanded="true" />
+            <element signature="e#2764#2765#0" expanded="true" />
+            <element signature="e#2795#2796#0" expanded="true" />
+            <element signature="e#2843#2844#0" expanded="true" />
+            <element signature="e#2883#2884#0" expanded="true" />
+            <element signature="e#2948#2949#0" expanded="true" />
+            <element signature="e#2980#2981#0" expanded="true" />
+            <element signature="e#3030#3031#0" expanded="true" />
+            <element signature="e#3072#3073#0" expanded="true" />
+            <element signature="e#3134#3135#0" expanded="true" />
+            <element signature="e#3162#3163#0" expanded="true" />
+            <element signature="e#3204#3205#0" expanded="true" />
+            <element signature="e#3238#3239#0" expanded="true" />
+            <element signature="e#3307#3308#0" expanded="true" />
+            <element signature="e#3346#3347#0" expanded="true" />
+            <element signature="e#3410#3411#0" expanded="true" />
+            <element signature="e#3466#3467#0" expanded="true" />
+            <element signature="e#3537#3538#0" expanded="true" />
+            <element signature="e#3567#3568#0" expanded="true" />
+            <element signature="e#3613#3614#0" expanded="true" />
+            <element signature="e#3651#3652#0" expanded="true" />
+            <element signature="e#3721#3722#0" expanded="true" />
+            <element signature="e#3759#3760#0" expanded="true" />
+            <element signature="e#3821#3822#0" expanded="true" />
+            <element signature="e#3875#3876#0" expanded="true" />
+            <element signature="e#3953#3954#0" expanded="true" />
+            <element signature="e#3991#3992#0" expanded="true" />
+            <element signature="e#4053#4054#0" expanded="true" />
+            <element signature="e#4107#4108#0" expanded="true" />
+            <element signature="e#4186#4187#0" expanded="true" />
+            <element signature="e#4225#4226#0" expanded="true" />
+            <element signature="e#4289#4290#0" expanded="true" />
+            <element signature="e#4345#4346#0" expanded="true" />
+            <element signature="e#4430#4431#0" expanded="true" />
+            <element signature="e#4474#4475#0" expanded="true" />
+            <element signature="e#4698#4699#0" expanded="true" />
+            <element signature="e#4740#4741#0" expanded="true" />
+            <element signature="e#4810#4811#0" expanded="true" />
+            <element signature="e#4872#4873#0" expanded="true" />
+            <element signature="e#4955#4956#0" expanded="true" />
+            <element signature="e#4994#4995#0" expanded="true" />
+            <element signature="e#5058#5059#0" expanded="true" />
+            <element signature="e#5114#5115#0" expanded="true" />
+            <element signature="e#5194#5195#0" expanded="true" />
+            <element signature="e#5233#5234#0" expanded="true" />
+            <element signature="e#5297#5298#0" expanded="true" />
+            <element signature="e#5353#5354#0" expanded="true" />
+            <element signature="e#5428#5429#0" expanded="true" />
+            <element signature="e#5462#5463#0" expanded="true" />
+            <element signature="e#5516#5517#0" expanded="true" />
+            <element signature="e#5562#5563#0" expanded="true" />
+            <element signature="e#5634#5635#0" expanded="true" />
+            <element signature="e#5670#5671#0" expanded="true" />
+            <element signature="e#5728#5729#0" expanded="true" />
+            <element signature="e#5778#5779#0" expanded="true" />
+            <element signature="e#5852#5853#0" expanded="true" />
+            <element signature="e#5888#5889#0" expanded="true" />
+            <element signature="e#5946#5947#0" expanded="true" />
+            <element signature="e#5996#5997#0" expanded="true" />
+            <element signature="e#6067#6068#0" expanded="true" />
+            <element signature="e#6100#6101#0" expanded="true" />
+            <element signature="e#6152#6153#0" expanded="true" />
+            <element signature="e#6196#6197#0" expanded="true" />
+            <element signature="e#6261#6262#0" expanded="true" />
+            <element signature="e#6291#6292#0" expanded="true" />
+            <element signature="e#6337#6338#0" expanded="true" />
+            <element signature="e#6375#6376#0" expanded="true" />
+            <element signature="e#6437#6438#0" expanded="true" />
+            <element signature="e#6467#6468#0" expanded="true" />
+            <element signature="e#6513#6514#0" expanded="true" />
+            <element signature="e#6551#6552#0" expanded="true" />
+            <element signature="e#6613#6614#0" expanded="true" />
+            <element signature="e#6643#6644#0" expanded="true" />
+            <element signature="e#6689#6690#0" expanded="true" />
+            <element signature="e#6727#6728#0" expanded="true" />
+            <element signature="e#6796#6797#0" expanded="true" />
+            <element signature="e#6829#6830#0" expanded="true" />
+            <element signature="e#6881#6882#0" expanded="true" />
+            <element signature="e#6925#6926#0" expanded="true" />
+            <element signature="e#6995#6996#0" expanded="true" />
+            <element signature="e#7030#7031#0" expanded="true" />
+            <element signature="e#7086#7087#0" expanded="true" />
+            <element signature="e#7134#7135#0" expanded="true" />
+            <element signature="e#7202#7203#0" expanded="true" />
+            <element signature="e#7233#7234#0" expanded="true" />
+            <element signature="e#7281#7282#0" expanded="true" />
+            <element signature="e#7321#7322#0" expanded="true" />
+            <element signature="e#7390#7391#0" expanded="true" />
+            <element signature="e#7426#7427#0" expanded="true" />
+            <element signature="e#7484#7485#0" expanded="true" />
+            <element signature="e#7534#7535#0" expanded="true" />
+            <element signature="e#7602#7603#0" expanded="true" />
+            <element signature="e#7636#7637#0" expanded="true" />
+            <element signature="e#7690#7691#0" expanded="true" />
+            <element signature="e#7736#7737#0" expanded="true" />
+            <element signature="e#7806#7807#0" expanded="true" />
+            <element signature="e#7840#7841#0" expanded="true" />
+            <element signature="e#7894#7895#0" expanded="true" />
+            <element signature="e#7940#7941#0" expanded="true" />
+            <element signature="e#8006#8007#0" expanded="true" />
+            <element signature="e#8036#8037#0" expanded="true" />
+            <element signature="e#8082#8083#0" expanded="true" />
+            <element signature="e#8120#8121#0" expanded="true" />
+            <element signature="e#8189#8190#0" expanded="true" />
+            <element signature="e#8226#8227#0" expanded="true" />
+            <element signature="e#8286#8287#0" expanded="true" />
+            <element signature="e#8338#8339#0" expanded="true" />
+            <element signature="e#8417#8418#0" expanded="true" />
+            <element signature="e#8457#8458#0" expanded="true" />
+            <element signature="e#8523#8524#0" expanded="true" />
+            <element signature="e#8581#8582#0" expanded="true" />
+            <element signature="e#8655#8656#0" expanded="true" />
+            <element signature="e#8687#8688#0" expanded="true" />
+            <element signature="e#8737#8738#0" expanded="true" />
+            <element signature="e#8779#8780#0" expanded="true" />
+            <element signature="e#8846#8847#0" expanded="true" />
+            <element signature="e#8879#8880#0" expanded="true" />
+            <element signature="e#8931#8932#0" expanded="true" />
+            <element signature="e#8975#8976#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#787#788#0" expanded="true" />
+            <element signature="e#817#818#0" expanded="true" />
+            <element signature="e#2105#2106#0" expanded="true" />
+            <element signature="e#2135#2136#0" expanded="true" />
+            <element signature="e#2431#2432#0" expanded="true" />
+            <element signature="e#2461#2462#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index 854f1f1..0db633a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -165,12 +165,16 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String startDay,String endDay) {
+    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew) {
         try {
 
             Criteria criteria = createCriteria(PgAlarm.class);
             criteria.addOrder(Order.desc("id"));
 
+            if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) {
+                criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
+            }
+
             if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay))
             {
                 criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay)));
@@ -193,9 +197,11 @@
 
                 criteria.add(Restrictions.le("alarmDate",date));
             }
+            if(StringUtils.isNotBlank(isNew)&&isNew.equals("true"))
+                criteria.add(Restrictions.eq("active", 1));
 
             List<PgAlarm> pgAlarmList = criteria.list();
-            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
     }
 
     //根据设备位置(仓位)获取摄像机列表
-    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+    public List<PgDeviceDto> getPgCameraListByPosition(String partition,String position){
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.like("position",position+"%"));
-//        criteria.add(Restrictions.eq("devType","球机"));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(position))
+            criteria.add(Restrictions.like("position",position+"%"));
+
         criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
 
         List<PgDevice> pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
             dto.setDevCode(objects[5].toString());
             dto.setDevType(objects[6].toString());
             if(objects[7]!=null)
-            dto.setIp(objects[7].toString());
+                dto.setIp(objects[7].toString());
             dto.setIsOpen(objects[8].toString());
             dto.setPartition(objects[11].toString());
             dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index 8ebf74d..3c657a7 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgEquipment;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
 import com.casic.PgInterface.devTable.dto.PgEquipmentDto;
@@ -34,9 +35,12 @@
     public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
-        criteria.add(Restrictions.eq("eqName",eqName));
-        criteria.add(Restrictions.eq("eqCode",eqCode));
-        criteria.add(Restrictions.eq("eqType",eqType));
+        if(StringUtils.isNotBlank(eqName))
+            criteria.add(Restrictions.eq("eqName",eqName));
+        if(StringUtils.isNotBlank(eqCode))
+            criteria.add(Restrictions.eq("eqCode",eqCode));
+        if(StringUtils.isNotBlank(eqType))
+            criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
@@ -51,10 +55,9 @@
 
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
-        //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
         String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
-        +eqType+"' group by equipment.EQ_NAME";
+                +eqType+"' group by equipment.EQ_NAME";
 
         List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4ed68e4..e413a5c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
@@ -39,7 +40,8 @@
 
     public List<PgPipeLineDto> getPipeLineByLineType(String lineType) {
         Criteria criteria = createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineType", lineType));
+        if(StringUtils.isNotBlank(lineType))
+            criteria.add(Restrictions.eq("lineType", lineType));
 
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    private Long id;
-    private String keyId;//巡检记录单id
-    private String planId;//巡检计划ID
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    @Column(name="KEY_ID")
-    public String getKeyId() {
-        return keyId;
-    }
-
-    public void setKeyId(String keyId) {
-        this.keyId = keyId;
-    }
-
-    @Column(name="PLAN_ID")
-    public String getPlanId() {
-        return planId;
-    }
-
-    public void setPlanId(String planId) {
-        this.planId = planId;
-    }
-
-    @Column(name="CREATE_DATE")
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    @Column(name="STATE")
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    @Column(name="CREATOR")
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    @Column(name="PLAN_NAME")
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    @Column(name="RECORD_NO")
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    @Column(name="PLAN_NO")
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    @Column(name="RESPONSIBIE_DEPT")
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    @Column(name="INSPECTION_PERSON")
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    @Column(name="PATROL_MAN")
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    @Column(name="OPERATE_DATE")
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    @Column(name="REMARK")
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Column(name="BUILD_CABIN")
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    @Column(name="PROJECT")
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    @Column(name="START_PILE_NO")
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    @Column(name="END_PILE_NO")
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    @Column(name="INSPECTION_PRACE")
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    @Column(name="OTHER_PATROL_MAN")
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private Long id;
+    private String KEY_ID;//唯一键值
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_PERSON;//巡检人
+    private String START_DATE;//巡检开始时间
+    private String END_DATE;
+    private String FREQUENCY;//巡检频率
+    private String STATE;//状态
+    private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+    private String PLAN_NO;//巡检计划编号
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_MODE;//巡检方式
+    private String INSPECTION_ROUTE;//巡检路线
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String INSPECTION_GROUP;//巡检部门
+    private String INSERT_TIME;//插入时间
+    private String FREQUENCYDATE;//巡检具体日期
+    private String FREQUENCYTIME;//巡检具体时间
+    private String CREATEDATE;//创建时间
+    private String CREATOR;//创建人
+    private String PROJECT;//项目
+    private String COMLILE;//编制人
+    private String START_TIME;//编制时间
+    private String DEVELOP_DEPT;//制定部门
+    private String END_TIME;//结束时间
+    private String START_PILE_NO;//开始桩号
+    private String END_PILE_NO;//结束桩号
+    private String BUILD_CABIN;//巡检舱室
+    private String MILEAGE;
+    private String FREQUENCY_TIME;//巡检具体时间
+    private String FREQUENCYTIME_END;
+    private String KETTLE_TS;
+    private String UPDATEDATE;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="KEY_ID")
+    public String getKEY_ID() {
+        return KEY_ID;
+    }
+
+    public void setKEY_ID(String KEY_ID) {
+        this.KEY_ID = KEY_ID;
+    }
+
+    @Column(name="PLAN_NAME")
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    @Column(name="INSPECTION_PERSON")
+    public String getINSPECTION_PERSON() {
+        return INSPECTION_PERSON;
+    }
+
+    public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+        this.INSPECTION_PERSON = INSPECTION_PERSON;
+    }
+
+    @Column(name="START_DATE")
+    public String getSTART_DATE() {
+        return START_DATE;
+    }
+
+    public void setSTART_DATE(String START_DATE) {
+        this.START_DATE = START_DATE;
+    }
+
+    @Column(name="END_DATE")
+    public String getEND_DATE() {
+        return END_DATE;
+    }
+
+    public void setEND_DATE(String END_DATE) {
+        this.END_DATE = END_DATE;
+    }
+
+    @Column(name="FREQUENCY")
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    @Column(name="STATE")
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    @Column(name="RESPONSIBLE_DEPT")
+    public String getRESPONSIBLE_DEPT() {
+        return RESPONSIBLE_DEPT;
+    }
+
+    public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+        this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+    }
+
+    @Column(name="PLAN_NO")
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    @Column(name="INSPECTION_TYPE")
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    @Column(name="INSPECTION_MODE")
+    public String getINSPECTION_MODE() {
+        return INSPECTION_MODE;
+    }
+
+    public void setINSPECTION_MODE(String INSPECTION_MODE) {
+        this.INSPECTION_MODE = INSPECTION_MODE;
+    }
+
+    @Column(name="INSPECTION_ROUTE")
+    public String getINSPECTION_ROUTE() {
+        return INSPECTION_ROUTE;
+    }
+
+    public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+        this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+    }
+
+    @Column(name="INSPECTION_START_TIME")
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    @Column(name="INSPECTION_END_TIME")
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    @Column(name="INSPECTION_PRACE")
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    @Column(name="INSPECTION_GROUP")
+    public String getINSPECTION_GROUP() {
+        return INSPECTION_GROUP;
+    }
+
+    public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+        this.INSPECTION_GROUP = INSPECTION_GROUP;
+    }
+
+    @Column(name="INSERT_TIME")
+    public String getINSERT_TIME() {
+        return INSERT_TIME;
+    }
+
+    public void setINSERT_TIME(String INSERT_TIME) {
+        this.INSERT_TIME = INSERT_TIME;
+    }
+
+    @Column(name="FREQUENCYDATE")
+    public String getFREQUENCYDATE() {
+        return FREQUENCYDATE;
+    }
+
+    public void setFREQUENCYDATE(String FREQUENCYDATE) {
+        this.FREQUENCYDATE = FREQUENCYDATE;
+    }
+
+    @Column(name="FREQUENCYTIME")
+    public String getFREQUENCYTIME() {
+        return FREQUENCYTIME;
+    }
+
+    public void setFREQUENCYTIME(String FREQUENCYTIME) {
+        this.FREQUENCYTIME = FREQUENCYTIME;
+    }
+
+    @Column(name="CREATEDATE")
+    public String getCREATEDATE() {
+        return CREATEDATE;
+    }
+
+    public void setCREATEDATE(String CREATEDATE) {
+        this.CREATEDATE = CREATEDATE;
+    }
+
+    @Column(name="CREATOR")
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    @Column(name="PROJECT")
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    @Column(name="COMLILE")
+    public String getCOMLILE() {
+        return COMLILE;
+    }
+
+    public void setCOMLILE(String COMLILE) {
+        this.COMLILE = COMLILE;
+    }
+
+    @Column(name="START_TIME")
+    public String getSTART_TIME() {
+        return START_TIME;
+    }
+
+    public void setSTART_TIME(String START_TIME) {
+        this.START_TIME = START_TIME;
+    }
+
+    @Column(name="DEVELOP_DEPT")
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    @Column(name="END_TIME")
+    public String getEND_TIME() {
+        return END_TIME;
+    }
+
+    public void setEND_TIME(String END_TIME) {
+        this.END_TIME = END_TIME;
+    }
+
+    @Column(name="START_PILE_NO")
+    public String getSTART_PILE_NO() {
+        return START_PILE_NO;
+    }
+
+    public void setSTART_PILE_NO(String START_PILE_NO) {
+        this.START_PILE_NO = START_PILE_NO;
+    }
+
+    @Column(name="END_PILE_NO")
+    public String getEND_PILE_NO() {
+        return END_PILE_NO;
+    }
+
+    public void setEND_PILE_NO(String END_PILE_NO) {
+        this.END_PILE_NO = END_PILE_NO;
+    }
+
+    @Column(name="BUILD_CABIN")
+    public String getBUILD_CABIN() {
+        return BUILD_CABIN;
+    }
+
+    public void setBUILD_CABIN(String BUILD_CABIN) {
+        this.BUILD_CABIN = BUILD_CABIN;
+    }
+
+    @Column(name="MILEAGE")
+    public String getMILEAGE() {
+        return MILEAGE;
+    }
+
+    public void setMILEAGE(String MILEAGE) {
+        this.MILEAGE = MILEAGE;
+    }
+
+    @Column(name="FREQUENCY_TIME")
+    public String getFREQUENCY_TIME() {
+        return FREQUENCY_TIME;
+    }
+
+    public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+        this.FREQUENCY_TIME = FREQUENCY_TIME;
+    }
+
+    @Column(name="FREQUENCYTIME_END")
+    public String getFREQUENCYTIME_END() {
+        return FREQUENCYTIME_END;
+    }
+
+    public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+        this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+    }
+
+    @Column(name="KETTLE_TS")
+    public String getKETTLE_TS() {
+        return KETTLE_TS;
+    }
+
+    public void setKETTLE_TS(String KETTLE_TS) {
+        this.KETTLE_TS = KETTLE_TS;
+    }
+
+    @Column(name="UPDATEDATE")
+    public String getUPDATEDATE() {
+        return UPDATEDATE;
+    }
+
+    public void setUPDATEDATE(String UPDATEDATE) {
+        this.UPDATEDATE = UPDATEDATE;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 5346b57..2f8d359 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -66,7 +66,7 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REPAIRMAN")
+    @Column(name="REOAIRMAN")
     public String getRepairMan() {
         return repairMan;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
-    private Long id;
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-
-
-    public static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
-        PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
-        pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
-        pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
-        pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
-        pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
-        pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
-        pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
-        pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
-        pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
-        pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
-        pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
-        pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
-        pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
-        pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
-        pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
-        return pgAssetInSpectionRecordDto;
-    }
-
-
-    public static List<PgAssetInSpectionRecordDto> ConvertToDtoList(List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList){
-        List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-        for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
-            pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
-        }
-
-        return pgAssetInSpectionRecordDtoList;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
-    private String num;
-    private String createDate;
-
-    public String getNum() {
-        return num;
-    }
-
-    public void setNum(String num) {
-        this.num = num;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+    private Long id;
+    private String PLAN_NO;//巡检计划编号
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String FREQUENCY;//巡检频率
+    private String CREATOR;//创建人
+    private String DEVELOP_DEPT;//制定部门
+    private String PROJECT;//项目
+    private String STATE;//状态
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+        PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+        pgAssetPlanDto.setId(pgAssetPlan.getId());
+        pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+        pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+        pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+        pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+        pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+        pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+        pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+        pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+        pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+        pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+        pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+        return pgAssetPlanDto;
+    }
+
+    public static List<PgAssetPlanDto> ConvertToPgAssetDtoList(List<PgAssetPlan> pgAssetPlanList){
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
+
+        for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+            pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+        }
+
+        return pgAssetPlanDtoList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
new file mode 100644
index 0000000..bc12db1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
@@ -0,0 +1,24 @@
+package com.casic.PgInterface.maintenance.dto;
+
+public class PgAssetPlanStatic {
+
+    private String num;
+    private String createDate;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
deleted file mode 100644
index c41ca7d..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.casic.PgInterface.maintenance.manager;
-
-import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
-
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
-        try {
-            String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
-                    "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
-                    "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-
-            if(patrolMan!=null)
-                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
-            if(startTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
-            if(endTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')<to_date('"+endTime+"','yyyy-MM-dd')";
-
-            sql+=" order by id";
-
-            List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
-
-            List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList=new ArrayList<>();
-            for(Object[] objects1:objects){
-                PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord();
-
-                pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString()));
-                pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1]));
-                pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2]));
-                pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3]));
-                pgAssetInSpectionRecord.setState(String.valueOf(objects1[4]));
-                pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5]));
-                pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6]));
-                pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7]));
-                pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8]));
-                pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9]));
-                pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10]));
-                pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11]));
-                pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12]));
-                pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13]));
-                pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14]));
-                pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15]));
-                pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16]));
-                pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17]));
-                pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18]));
-                pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19]));
-
-                pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord);
-            }
-
-            List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-            for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList)
-            {
-                pgAssetInSpectionRecordDtoList.add(PgAssetInSpectionRecordDto.ConvertToDto(pgAssetInSpectionRecord));
-            }
-
-            return pgAssetInSpectionRecordDtoList;
-        }
-        catch(Exception e)
-        {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public List<PgAssetInSpectionRecordStatic> getPgAssetInSpectionRecordStaticLisByTime(
-            String startTime, String endTime, String staticType) {
-
-        String sql="";
-        String dateType="";
-        List<PgAssetInSpectionRecordStatic> pgAssetInSpectionRecordStaticList=new ArrayList<>();
-        int type=Integer.valueOf(staticType);
-
-        switch(type) {
-            case 0://年
-                dateType = "yyyy";
-                break;
-            case 1://月
-                dateType = "yyyy-mm";
-                break;
-            case 2://周
-                dateType = "iw";
-                break;
-            case 3://日
-                dateType="yyyy-mm-dd";
-                break;
-            default:
-                break;
-        }
-
-        sql="select count(*), to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_RECORD t where 1=1";
-
-        if(startTime!=null)
-            sql+=" and t.CREATE_DATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
-        if(endTime!=null)
-            sql+=" and t.CREATE_DATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
-
-        sql+=" group by to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"')";
-
-        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
-        for(int i=0;i<objects.size();i++)
-        {
-            PgAssetInSpectionRecordStatic pgAssetInSpectionRecordStatic=new PgAssetInSpectionRecordStatic();
-            pgAssetInSpectionRecordStatic.setNum(objects.get(i)[0].toString());
-            pgAssetInSpectionRecordStatic.setCreateDate(objects.get(i)[1].toString());
-            pgAssetInSpectionRecordStaticList.add(pgAssetInSpectionRecordStatic);
-        }
-        return pgAssetInSpectionRecordStaticList;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
new file mode 100644
index 0000000..bb6bf1e
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
@@ -0,0 +1,81 @@
+package com.casic.PgInterface.maintenance.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgAssetPlanManager extends HibernateEntityDao<PgAssetPlan> {
+
+    public List<PgAssetPlanDto> getPgAssetPlanDtoList(String inSpectionPlace){
+        Criteria criteria=createCriteria(PgAssetPlan.class);
+
+        if(StringUtils.isNotBlank(inSpectionPlace))
+            criteria.add(Restrictions.like("INSPECTION_PRACE","%"+inSpectionPlace+"%"));
+        criteria.addOrder(Order.desc("id"));
+
+        List<PgAssetPlan> pgAssetPlanList=criteria.list();
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=PgAssetPlanDto.ConvertToPgAssetDtoList(pgAssetPlanList);
+
+        if(pgAssetPlanDtoList==null||pgAssetPlanDtoList.size()==0)
+            return null;
+        else
+            return pgAssetPlanDtoList;
+    }
+
+    public List<PgAssetPlanStatic> getPgAssetPlanStaticLisByTime(
+            String startTime, String endTime, String staticType) {
+
+        String sql="";
+        String dateType="";
+        List<PgAssetPlanStatic> pgAssetPlanStaticList=new ArrayList<>();
+        int type=Integer.valueOf(staticType);
+
+        switch(type) {
+            case 0://年
+                dateType = "yyyy";
+                break;
+            case 1://月
+                dateType = "yyyy-mm";
+                break;
+            case 2://周
+                dateType = "iw";
+                break;
+            case 3://日
+                dateType="yyyy-mm-dd";
+                break;
+            default:
+                break;
+        }
+
+        sql="select count(*), to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_PLAN t where 1=1";
+
+        if(startTime!=null)
+            sql+=" and t.CREATEDATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
+        if(endTime!=null)
+            sql+=" and t.CREATEDATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
+
+        sql+=" group by to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"')";
+
+        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
+        for(int i=0;i<objects.size();i++)
+        {
+            PgAssetPlanStatic pgAssetPlanStatic=new PgAssetPlanStatic();
+            pgAssetPlanStatic.setNum(objects.get(i)[0].toString());
+            pgAssetPlanStatic.setCreateDate(objects.get(i)[1].toString());
+            pgAssetPlanStaticList.add(pgAssetPlanStatic);
+        }
+        return pgAssetPlanStaticList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 0903f22..3484739 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -15,7 +15,7 @@
 
     public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
             if(repairMan!=null)
                 sql+=" and REPAIRMAN like '%"+repairMan+"%'";
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index 9cc2881..6d90d7b 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -1,5 +1,7 @@
 package com.casic.PgInterface.patroler.dto;
 
+import com.casic.PgInterface.devTable.domain.PgDevice;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 
 /**
@@ -14,6 +16,7 @@
     private String unit;//单位
     private String alarmType;//报警类型
     private Long pgDeviceId;//设备编号
+    private String assetCode;//资产编号
 
     public Long getId() {
         return id;
@@ -71,7 +74,15 @@
         this.pgDeviceId = pgDeviceId;
     }
 
-    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
+    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule, PgDeviceManager pgDeviceManager) {
         this.setId(pgAlarmRule.getId());
         this.setHighValue(pgAlarmRule.getHighValue());
         this.setLowValue(pgAlarmRule.getLowValue());
@@ -82,6 +93,10 @@
         else
             this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
         this.setPgDeviceId(pgAlarmRule.getPgDeviceId());
+        if(pgAlarmRule.getAlarmTypeId()!=null&&pgDeviceManager.get(pgAlarmRule.getPgDeviceId())!=null)
+            this.setAssetCode(pgDeviceManager.get(pgAlarmRule.getPgDeviceId()).getAssetCode());
+        else
+            this.setAssetCode("");
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
index c132c98..a7cef5b 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
@@ -1,13 +1,17 @@
 package com.casic.PgInterface.patroler.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.ResponseStatus;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -17,30 +21,23 @@
 @Service
 public class PgAlarmRuleManager extends HibernateEntityDao<PgAlarmRule> {
 
+    @Resource
+    private PgDeviceManager pgDeviceManager;
+
     //根据设备获取设备报警阈值
-    public List<PgAlarmRuleDto>  getAlarmRuleDto() {
+    public List<PgAlarmRuleDto>  getAlarmRuleDto(String devType) {
         Criteria criteria=createCriteria(PgAlarmRule.class);
+
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.eq("devType", devType));
         criteria.addOrder(Order.desc("id"));
 
         List<PgAlarmRule> pgAlarmRuleList=criteria.list();
-        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
+        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         for (PgAlarmRule pgAlarmRule : pgAlarmRuleList) {
-            pgAlarmRuleDtoList.add(new PgAlarmRuleDto(pgAlarmRule));
+            pgAlarmRuleDtoList.add(new PgAlarmRuleDto(pgAlarmRule,pgDeviceManager));
         }
         return pgAlarmRuleDtoList;
-
     }
 
-    public PgAlarmRule getAlarmRuleBydevType(String devType) {
-        Criteria criteria=createCriteria(PgAlarmRule.class);
-        criteria.add(Restrictions.eq("devType", devType));
-
-        List<PgAlarmRule> pgAlarmRuleList=criteria.list();
-
-        if(pgAlarmRuleList==null||pgAlarmRuleList.size()==0)
-            return null;
-        else
-            return pgAlarmRuleList.get(0);
-    }
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index d0e28f5..082ba5d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgAlarm;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
@@ -39,7 +40,7 @@
     private PgReservePlanManager pgReservePlanManager;
 
     /*
-    * 获取报警设备信息
+     * 获取报警设备信息
      */
     @POST
     @Path("linkDevice")
@@ -50,11 +51,22 @@
 
         PgDeviceDto pgDeviceDto = null;
         try {
-            PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
-            PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
-
-            pgDeviceDto=new PgDeviceDto(pgDevice);
-            msg = "报警关联设备获取成功";
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if (pgAlarm == null)
+                    msg = "不存在报警信息";
+                else {
+                    PgDevice pgDevice = pgAlarm.getAlarmDevId();
+                    if (pgDevice == null)
+                        msg = "不存在报警设备";
+                    else {
+                        pgDeviceDto = new PgDeviceDto(pgDevice);
+                        msg = "报警关联设备获取成功";
+                    }
+                }
+            }
+            else
+                msg="未接受到报警设备ID信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取关联设备失败";
@@ -77,11 +89,28 @@
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
-            PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
-            PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
-            pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if(pgAlarm==null)
+                    msg="不存在报警信息";
+                else {
+                    PgDevice pgDevice = pgAlarm.getAlarmDevId();
+                    if (pgDevice == null)
+                        msg = "不存在报警设备";
+                    else {
+                        String strPosition=pgDevice.getPosition();
+                        String position="";
+                        if(!strPosition.equals(""))
+                            position=pgDevice.getPosition().substring(0,3);
+                        String partition=pgDevice.getPartition();
 
-            msg = "关联设备获取成功";
+                        pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
+                        msg = "关联设备获取成功";
+                    }
+                }
+            }
+            else
+                msg="请输入报警设备Id信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "分区设备关联失败";
@@ -93,7 +122,7 @@
 
     /*
      * 根据报警记录获取关联的预案
-    */
+     */
     @POST
     @Path("linkReservePlan")
     @Produces(MediaType.APPLICATION_JSON)
@@ -103,10 +132,21 @@
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
-            PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
-            pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if (pgAlarm == null)
+                    msg = "不存在报警信息";
+                else {
+                    pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-            msg="关联预案获取成功";
+                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
+                        msg="不存在关联的报警预案";
+                    else
+                        msg = "关联预案获取成功";
+                }
+            }
+            else
+                msg="请输入报警信息";
         }
         catch(Exception e)
         {
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index d18ebb8..baacd93 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -48,14 +48,16 @@
     @POST
     @Path("getAlarmInfo")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmList(@FormParam("startDay") String startDay,
-                                            @FormParam("endDay") String endDay) throws Exception {
+    public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
+                                            @FormParam("startDay") String startDay,
+                                            @FormParam("endDay") String endDay,
+                                            @FormParam("isNew") String isNew) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(startDay,endDay);
-            if (pgAlarmDtoList.size() == 0)
+            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew);
+            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
                 msg = "没有报警信息";
             else
                 msg = "报警信息获取成功";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 87afd54..29ce8a4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -1,7 +1,5 @@
 package com.casic.PgInterface.rs;
 
-import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager;
-import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import com.casic.PgInterface.patroler.manager.PgAlarmRuleManager;
@@ -30,119 +28,23 @@
     private static Logger logger = LoggerFactory.getLogger(PgAlarmRule.class);
 
     @Resource
-    private PgDeviceManager pgDeviceManager;
-    @Resource
-    private PgAlarmTypeManager pgAlarmTypeManager;
-    @Resource
     private PgAlarmRuleManager pgAlarmRuleManager;
 
-
-
-    /**
-     * 新增报警阈值
-     */
-    @POST
-    @Path("addAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> addAlarmRule(@FormParam("highValue") String highValue,
-                                            @FormParam("lowValue") String lowValue,
-                                            @FormParam("unit") String unit,
-                                            @FormParam("devType") String devType,
-                                            @FormParam("alarmType") String alarmType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType);
-            if (pgAlarmRule != null) {
-                result = "false";
-                msg = "设备阈值已经存在";
-            } else {
-                pgAlarmRule = new PgAlarmRule();
-                pgAlarmRule.setHighValue(highValue);
-                pgAlarmRule.setLowValue(lowValue);
-                pgAlarmRule.setDevType(devType);
-                pgAlarmRule.setUnit(unit);
-                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
-
-                pgAlarmRuleManager.save(pgAlarmRule);
-                result = "true";
-                msg = "报警阈值新增成功";
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = "false";
-            msg = "报警阈值新增失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-        return resultMap;
-    }
-
-    /**
-     * 编辑报警阈值
-     */
-    @POST
-    @Path("editAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> editAlarmRule(@FormParam("id") String id,
-                                             @FormParam("devType") String devType,
-                                             @FormParam("highValue") String highValue,
-                                             @FormParam("lowValue") String lowValue,
-                                             @FormParam("unit") String unit,
-                                             @FormParam("alarmType") String alarmType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
-            if (pgAlarmRule == null) {
-                msg = "不存在报警阈值记录";
-                result = "false";
-            } else {
-                pgAlarmRule.setDevType(devType);
-                pgAlarmRule.setHighValue(highValue);
-                pgAlarmRule.setLowValue(lowValue);
-                pgAlarmRule.setUnit(unit);
-                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
-
-                pgAlarmRuleManager.save(pgAlarmRule);
-                msg = "编辑成功";
-                result = "true";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            result = "false";
-            msg = "报警阈值编辑失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-
-        return resultMap;
-    }
-
     /**
      * 获取报警阈值信息
      */
     @POST
     @Path("getAlarmRule")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmRule() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+    public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
+        System.out.println("devType:"+devType);
+        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
-            pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto();
-            if (pgAlarmRuleDtoList == null)
+            pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
+            if (pgAlarmRuleDtoList == null||pgAlarmRuleDtoList.size()==0)
                 msg = "不存在报警阈值信息";
             else
                 msg = "报警阈值获取成功";
@@ -155,69 +57,4 @@
         return resultMap;
     }
 
-    /**
-     * 删除报警阈值
-     */
-    @POST
-    @Path("deleteAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> deleteAlarmRule(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
-            if (pgAlarmRule == null) {
-                msg = "不存在报警阈值记录";
-                result = "false";
-            } else {
-                pgAlarmRuleManager.remove(pgAlarmRule);
-                msg = "删除成功";
-                result = "true";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            result = "false";
-            msg = "报警阈值删除失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-
-        return resultMap;
-    }
-
-    /**
-     * 根据设备类型报警阈值
-     */
-    @POST
-    @Path("getAlarmRuleByDevType")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmRuleByDevType(@FormParam("devType") String devType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        PgAlarmRule pgAlarmRule = null;
-        List<PgAlarmRuleDto> pgAlarmRuleDtos = new ArrayList<>();
-        try {
-            pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType);
-            if (pgAlarmRule == null)
-                msg = "不存在报警阈值记录";
-            else {
-                PgAlarmRuleDto pgAlarmRuleDto= new PgAlarmRuleDto(pgAlarmRule);
-                pgAlarmRuleDtos.add(pgAlarmRuleDto);
-                msg = "报警阈值获取成功";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            msg = "报警阈值获取失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmRuleDtos);
-
-        return resultMap;
-    }
-
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
new file mode 100644
index 0000000..19d3b8c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanRs")
+public class PgAssetPlanRs {
+
+    @Resource
+    private PgAssetPlanManager pgAssetPlanManager;
+
+    /**
+     * 获取巡检记录
+     */
+    @POST
+    @Path("getPgAssetPlanList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPgAssetPlanList(@FormParam("inSpectionPlace") String inSpectionPlace){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
+        try{
+            pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(inSpectionPlace);
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
+                msg="巡检信息获取成功";
+            else
+                msg="不存在巡检信息";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="巡检信息获取失败";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAssetPlanDtoList);
+
+        return resultMap;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
new file mode 100644
index 0000000..47ef9d1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanStaticRs")
+public class PgAssetPlanStaticRs {
+
+    @Resource
+    private PgAssetPlanManager pgAssetPlanManager;
+
+    @POST
+    @Path("getPgAssetPlanStaticList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPgAssetPlanStaticList(@FormParam("startTime") String startTime,
+                                                       @FormParam("endTime") String endTime,
+                                                       @FormParam("staticType") String staticType) throws Exception{
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
+        try{
+            pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
+                msg="巡检统计信息获取成功";
+            else
+                msg="统计信息获取失败";
+        }
+        catch (Exception ex){
+            ex.printStackTrace();
+            msg="统计失败";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAssetPlanStaticList);
+
+        return resultMap;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
deleted file mode 100644
index 66f4d09..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.manager.PgAssetInSpectionRecordManager;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@Path("pgAssetRecordRs")
-public class PgAssetRecordRs {
-
-    @Resource
-    private PgAssetInSpectionRecordManager pgAssetInSpectionRecordManager;
-
-    /**
-     * 获取巡检记录
-     */
-    @POST
-    @Path("getPgAssetRecordList")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgAssetRecordList(@FormParam("patrolMan") String patrolMan,
-                                                   @FormParam("startTime") String startTime,
-                                                   @FormParam("endTime") String endTime){
-        Map<String,Object> resultMap=new HashMap<>();
-        String msg="";
-
-        List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-        try{
-            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(patrolMan,startTime,endTime);
-            if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0)
-                msg="巡检信息获取成功";
-            else
-                msg="不存在巡检信息";
-        }
-        catch(Exception ex){
-            ex.printStackTrace();
-            msg="巡检信息获取失败";
-        }
-
-        resultMap.put("msg",msg);
-        resultMap.put("result",pgAssetInSpectionRecordDtoList);
-
-        return resultMap;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java
deleted file mode 100644
index 5f0417a..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import com.casic.PgInterface.maintenance.manager.PgAssetInSpectionRecordManager;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@Path("pgAssetRecordStaticRs")
-public class PgAssetRecordStaticRs {
-
-    @Resource
-    private PgAssetInSpectionRecordManager pgAssetInSpectionRecordManager;
-
-    @POST
-    @Path("getPgAssetRecordHeadStaticList")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgAssetRecordHeadStaticList(@FormParam("startTime") String startTime,
-                                                                @FormParam("endTime") String endTime,
-                                                                @FormParam("staticType") String staticType) throws Exception{
-        Map<String,Object> resultMap=new HashMap<>();
-        String msg="";
-        String result="";
-
-        List<PgAssetInSpectionRecordStatic> pgAssetInSpectionRecordStaticList = null;
-        try{
-            pgAssetInSpectionRecordStaticList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetInSpectionRecordStaticList!=null&&pgAssetInSpectionRecordStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
-            else
-                msg="统计信息获取失败";
-        }
-        catch (Exception ex){
-            ex.printStackTrace();
-            msg="统计失败";
-        }
-
-        resultMap.put("msg",msg);
-        resultMap.put("result",pgAssetInSpectionRecordStaticList);
-
-        return resultMap;
-    }
-
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index 9dfdd88..a0245ba 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -326,7 +326,7 @@
 
             PgConstruction pgConstruction=pgConstructionManager.get(Long.valueOf(id));
 
-            pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(pgConstruction.getPgName());
+            pgDeviceDtoList=pgDeviceManager.getPgCameraListByPartition(pgConstruction.getPgName());
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index 1c8130c..c276fb3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -177,6 +177,7 @@
             else
             {
                 pgEquipment.setActive(0);
+                pgEquipmentManager.save(pgEquipment);
                 msg="删除成功";
                 result="true";
             }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index 486b49f..f0b936c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -287,7 +287,7 @@
         try {
             if (apCode != "") {
                 String apCodeStr=apCode.substring(0,3);
-                pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(apCodeStr);
+                pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition("",apCodeStr);
                 if(pgDeviceDtoList==null)
                     msg="不存在关联摄像机";
                 else
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 982e3d9..a6da81e 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -11,15 +11,13 @@
 
 
 # ============================================================================
-# dbd
+# db
 # ============================================================================
 db.default.driverClassName=oracle.jdbc.driver.OracleDriver
-db.default.url=jdbc:oracle:thin:@172.17.0.201:1521:szgl
-#db.default.url=jdbc:oracle:thin:@119.254.103.80:1521:chengdu
-db.default.username=scott
-db.default.password=scott
-#db.default.username=PG
-#db.default.password=PG
+#db.default.url=jdbc:oracle:thin:@172.17.0.201:1521:szgl
+db.default.url=jdbc:oracle:thin:@119.254.103.80:1521:chengdu
+db.default.username=PG
+db.default.password=PG
 
 
 # ============================================================================
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190828.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190828.docx"
new file mode 100644
index 0000000..7920004
--- /dev/null
+++ "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190828.docx"
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190828.docx" "b/~$\350\257\264\346\230\21620190828.docx"
new file mode 100644
index 0000000..575ddd4
--- /dev/null
+++ "b/~$\350\257\264\346\230\21620190828.docx"
Binary files differ

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ff69e2a..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,27 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190828.docx" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -32,72 +42,119 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="2" />
-          <entry key="java" value="243" />
-          <entry key="properties" value="6" />
+          <entry key="java" value="321" />
+          <entry key="properties" value="8" />
           <entry key="xml" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
-          <entry key="JAVA" value="243" />
-          <entry key="Properties" value="6" />
+          <entry key="JAVA" value="321" />
+          <entry key="Properties" value="8" />
           <entry key="XML" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="8082" />
-          <entry key="properties" value="49" />
-          <entry key="txt" value="64" />
+          <entry key="dummy" value="16" />
+          <entry key="java" value="10723" />
+          <entry key="properties" value="59" />
+          <entry key="txt" value="118" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="8082" />
-          <entry key="PLAIN_TEXT" value="64" />
-          <entry key="Properties" value="49" />
+          <entry key="JAVA" value="10723" />
+          <entry key="PLAIN_TEXT" value="134" />
+          <entry key="Properties" value="59" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="4" />
+          <entry key="project.closed" value="28" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
           <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.24" value="1" />
+          <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="1" />
-          <entry key="project.open.time.3" value="3" />
-          <entry key="project.open.time.31" value="1" />
+          <entry key="project.open.time.28" value="1" />
+          <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.31" value="2" />
           <entry key="project.open.time.37" value="1" />
+          <entry key="project.open.time.39" value="2" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.40" value="1" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="1" />
+          <entry key="project.open.time.44" value="2" />
           <entry key="project.open.time.45" value="2" />
           <entry key="project.open.time.48" value="1" />
           <entry key="project.open.time.49" value="1" />
+          <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.58" value="1" />
           <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.71" value="1" />
+          <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.71" value="2" />
           <entry key="project.open.time.76" value="1" />
-          <entry key="project.opened" value="25" />
+          <entry key="project.opened" value="41" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+            <state relative-caret-position="174">
+              <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
               <folding>
-                <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-                <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="352">
+              <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#787#788#0" expanded="true" />
+                <element signature="e#817#818#0" expanded="true" />
+                <element signature="e#2105#2106#0" expanded="true" />
+                <element signature="e#2135#2136#0" expanded="true" />
+                <element signature="e#2431#2432#0" expanded="true" />
+                <element signature="e#2461#2462#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="638">
+              <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+              <folding>
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -122,6 +179,7 @@
       <find>getPgDeviceByDevType</find>
       <find>message</find>
       <find>getConstructionByType</find>
+      <find>getPgCameraListByPosition</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -130,24 +188,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanTypeDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
@@ -162,17 +207,38 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
       </list>
     </option>
   </component>
@@ -208,16 +274,18 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="3" />
-    <option name="y" value="10" />
-    <option name="width" value="1386" />
-    <option name="height" value="788" />
+    <option name="x" value="1410" />
+    <option name="y" value="117" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -258,7 +326,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -267,16 +335,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -286,7 +345,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="dto" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -296,7 +355,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="manager" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -308,19 +367,10 @@
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="webapp" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -359,6 +409,7 @@
       </deployment>
       <server-settings>
         <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_7" />
+        <option name="JNDI_PORT" value="10991" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -456,7 +507,23 @@
       <workItem from="1566350810712" duration="6803000" />
       <workItem from="1566435787074" duration="10717000" />
       <workItem from="1566521753529" duration="14265000" />
-      <workItem from="1566614176989" duration="5693000" />
+      <workItem from="1566614176989" duration="14059000" />
+      <workItem from="1566780822009" duration="1026000" />
+      <workItem from="1566891563975" duration="284000" />
+      <workItem from="1566893107340" duration="3382000" />
+      <workItem from="1566953794976" duration="11039000" />
+      <workItem from="1567059357700" duration="484000" />
+      <workItem from="1567082835097" duration="1086000" />
+      <workItem from="1567126428020" duration="1539000" />
+      <workItem from="1567129277820" duration="5788000" />
+      <workItem from="1567136008996" duration="2568000" />
+      <workItem from="1567237040302" duration="111000" />
+      <workItem from="1567495626345" duration="2797000" />
+      <workItem from="1567558770152" duration="2352000" />
+      <workItem from="1567577368149" duration="640000" />
+      <workItem from="1567751224608" duration="780000" />
+      <workItem from="1568019299799" duration="695000" />
+      <workItem from="1568082566133" duration="4016000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -493,17 +560,60 @@
       <option name="project" value="LOCAL" />
       <updated>1566553388171</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="整理管线部分">
+      <created>1566620046627</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1566620046627</updated>
+    </task>
+    <task id="LOCAL-00007" summary="合并代码提交">
+      <created>1566781001910</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1566781001910</updated>
+    </task>
+    <task id="LOCAL-00008" summary="合并代码提交">
+      <created>1566963831930</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1566963831930</updated>
+    </task>
+    <task id="LOCAL-00009" summary="修改报警阈值">
+      <created>1566972146710</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1566972146710</updated>
+    </task>
+    <task id="LOCAL-00010" summary="修改巡检维护表字段">
+      <created>1567126525554</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1567126525554</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="142930000" />
+    <option name="totallyTimeSpent" value="189883000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
+    <frame x="1358" y="-8" width="1456" height="916" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29297996" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -511,13 +621,14 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Thumbnails" weight="0.3295082" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.5081967" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.3849105" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
       <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
       <window_info anchor="bottom" id="Spring" order="8" />
       <window_info anchor="bottom" id="Terminal" order="9" />
@@ -539,7 +650,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2193646" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -547,22 +658,23 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.47540984" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
-      <window_info anchor="bottom" id="Spring" order="8" />
-      <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
-      <window_info anchor="bottom" id="Statistic" order="11" />
-      <window_info anchor="bottom" id="Java Enterprise" order="12" />
-      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="14" weight="0.32786885" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.52307695" />
+      <window_info anchor="bottom" id="Thumbnails" order="0" weight="0.3295082" />
+      <window_info anchor="bottom" id="Message" order="1" />
+      <window_info anchor="bottom" id="Find" order="2" />
+      <window_info anchor="bottom" id="Run" order="3" />
+      <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.49924356" weight="0.49344262" />
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Application Servers" order="8" weight="0.3276923" />
+      <window_info anchor="bottom" id="Spring" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
+      <window_info anchor="bottom" id="Statistic" order="12" />
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <window_info anchor="bottom" id="Database Changes" order="14" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="15" weight="0.32786885" />
+      <window_info anchor="bottom" id="Messages" order="16" weight="0.5229508" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -578,6 +690,16 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -587,7 +709,11 @@
     <MESSAGE value="修改权限问题" />
     <MESSAGE value="修改人员登录返回接口" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整理管线部分" />
+    <MESSAGE value="合并代码提交" />
+    <MESSAGE value="修改报警阈值" />
+    <MESSAGE value="修改巡检维护表字段" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护表字段" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -602,322 +728,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-532">
-          <caret line="50" column="28" lean-forward="true" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="19" column="60" selection-start-line="19" selection-start-column="60" selection-end-line="19" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="100" column="34" lean-forward="true" selection-start-line="100" selection-start-column="34" selection-end-line="100" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1474">
-          <caret line="84" column="58" selection-start-line="84" selection-start-column="58" selection-end-line="84" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1100">
-          <caret line="58" column="18" selection-start-line="58" selection-start-column="18" selection-end-line="58" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6842">
-          <caret line="329" selection-start-line="329" selection-end-line="329" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="102" column="24" lean-forward="true" selection-start-line="102" selection-start-column="24" selection-end-line="102" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="72" column="56" lean-forward="true" selection-start-line="72" selection-start-column="56" selection-end-line="72" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="90" column="39" lean-forward="true" selection-start-line="90" selection-start-column="39" selection-end-line="90" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="97" column="16" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
-          <caret line="14" column="52" lean-forward="true" selection-start-line="14" selection-start-column="52" selection-end-line="14" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="26" column="34" lean-forward="true" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="61" column="1" lean-forward="true" selection-start-line="61" selection-start-column="1" selection-end-line="61" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="208" column="49" lean-forward="true" selection-start-line="208" selection-start-column="49" selection-end-line="208" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="140" column="57" selection-start-line="140" selection-start-column="57" selection-end-line="140" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="111" column="36" selection-start-line="111" selection-start-column="36" selection-end-line="111" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="3" lean-forward="true" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="81" column="58" lean-forward="true" selection-start-line="81" selection-start-column="58" selection-end-line="81" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="472">
-          <caret line="118" column="59" selection-start-line="118" selection-start-column="59" selection-end-line="118" selection-end-column="59" />
-          <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-198">
-          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="69" column="32" lean-forward="true" selection-start-line="69" selection-start-column="32" selection-end-line="70" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="142" column="59" lean-forward="true" selection-start-line="142" selection-start-column="59" selection-end-line="142" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="349" column="9" lean-forward="true" selection-start-line="349" selection-start-column="9" selection-end-line="349" selection-end-column="9" />
-          <folding>
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="e#12105#12121#0" expanded="true" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-686">
-          <caret line="67" column="31" lean-forward="true" selection-start-line="67" selection-start-column="31" selection-end-line="67" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="93" column="24" lean-forward="true" selection-start-line="93" selection-start-column="24" selection-end-line="93" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="57" column="23" lean-forward="true" selection-start-line="57" selection-start-column="23" selection-end-line="57" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-408">
-          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="98" column="40" lean-forward="true" selection-start-line="98" selection-start-column="40" selection-end-line="98" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="572">
@@ -925,13 +735,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="328" column="32" lean-forward="true" selection-start-line="328" selection-start-column="32" selection-end-line="328" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
@@ -950,16 +753,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="396">
           <caret line="23" column="32" lean-forward="true" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
-          <folding>
-            <element signature="e#2635#2636#0" expanded="true" />
-            <element signature="e#2671#2672#0" expanded="true" />
-            <element signature="e#2727#2728#0" expanded="true" />
-            <element signature="e#2777#2778#0" expanded="true" />
-            <element signature="e#2877#2878#0" expanded="true" />
-            <element signature="e#2911#2912#0" expanded="true" />
-            <element signature="e#2963#2964#0" expanded="true" />
-            <element signature="e#3009#3010#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -972,14 +765,481 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+        <state relative-caret-position="66">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="59" column="46" lean-forward="true" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3586">
+          <caret line="179" column="16" selection-start-line="179" selection-start-column="16" selection-end-line="179" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5478">
+          <caret line="273" column="3" selection-start-line="273" selection-start-column="3" selection-end-line="273" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1870">
+          <caret line="147" column="11" selection-start-line="147" selection-start-column="11" selection-end-line="147" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="55" column="15" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="106">
+          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="290" column="41" lean-forward="true" selection-start-line="290" selection-start-column="41" selection-end-line="290" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="21" column="32" lean-forward="true" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="550">
+          <caret line="38" column="89" selection-start-line="38" selection-start-column="89" selection-end-line="38" selection-end-column="89" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="11" column="28" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1166">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="818">
+          <caret line="285" column="13" lean-forward="true" selection-start-line="285" selection-start-column="13" selection-end-line="285" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="129" column="31" lean-forward="true" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="323" column="72" lean-forward="true" selection-start-line="323" selection-start-column="72" selection-end-line="323" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="44" column="13" lean-forward="true" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-638">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="244">
+          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="157">
+          <caret line="16" column="55" lean-forward="true" selection-start-line="16" selection-start-column="55" selection-end-line="16" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="270" column="33" lean-forward="true" selection-start-line="270" selection-start-column="33" selection-end-line="270" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="490">
+          <caret line="141" selection-start-line="141" selection-end-line="141" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="164" column="5" lean-forward="true" selection-start-line="164" selection-start-column="5" selection-end-line="164" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/apiTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-242">
+          <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="61" column="16" lean-forward="true" selection-start-line="61" selection-start-column="16" selection-end-line="61" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="700">
+          <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="12" column="34" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="39" column="9" lean-forward="true" selection-start-line="39" selection-start-column="9" selection-end-line="39" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="32" column="29" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="29" />
           <folding>
-            <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-            <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#1838#1839#0" expanded="true" />
+            <element signature="e#1863#1864#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1925#1926#0" expanded="true" />
+            <element signature="e#1822#1823#0" expanded="true" />
+            <element signature="e#1851#1852#0" expanded="true" />
+            <element signature="e#1895#1896#0" expanded="true" />
+            <element signature="e#1931#1932#0" expanded="true" />
+            <element signature="e#2132#2133#0" expanded="true" />
+            <element signature="e#2164#2165#0" expanded="true" />
+            <element signature="e#2214#2215#0" expanded="true" />
+            <element signature="e#2256#2257#0" expanded="true" />
+            <element signature="e#2330#2331#0" expanded="true" />
+            <element signature="e#2370#2371#0" expanded="true" />
+            <element signature="e#2436#2437#0" expanded="true" />
+            <element signature="e#2494#2495#0" expanded="true" />
+            <element signature="e#2569#2570#0" expanded="true" />
+            <element signature="e#2602#2603#0" expanded="true" />
+            <element signature="e#2654#2655#0" expanded="true" />
+            <element signature="e#2698#2699#0" expanded="true" />
+            <element signature="e#2764#2765#0" expanded="true" />
+            <element signature="e#2795#2796#0" expanded="true" />
+            <element signature="e#2843#2844#0" expanded="true" />
+            <element signature="e#2883#2884#0" expanded="true" />
+            <element signature="e#2948#2949#0" expanded="true" />
+            <element signature="e#2980#2981#0" expanded="true" />
+            <element signature="e#3030#3031#0" expanded="true" />
+            <element signature="e#3072#3073#0" expanded="true" />
+            <element signature="e#3134#3135#0" expanded="true" />
+            <element signature="e#3162#3163#0" expanded="true" />
+            <element signature="e#3204#3205#0" expanded="true" />
+            <element signature="e#3238#3239#0" expanded="true" />
+            <element signature="e#3307#3308#0" expanded="true" />
+            <element signature="e#3346#3347#0" expanded="true" />
+            <element signature="e#3410#3411#0" expanded="true" />
+            <element signature="e#3466#3467#0" expanded="true" />
+            <element signature="e#3537#3538#0" expanded="true" />
+            <element signature="e#3567#3568#0" expanded="true" />
+            <element signature="e#3613#3614#0" expanded="true" />
+            <element signature="e#3651#3652#0" expanded="true" />
+            <element signature="e#3721#3722#0" expanded="true" />
+            <element signature="e#3759#3760#0" expanded="true" />
+            <element signature="e#3821#3822#0" expanded="true" />
+            <element signature="e#3875#3876#0" expanded="true" />
+            <element signature="e#3953#3954#0" expanded="true" />
+            <element signature="e#3991#3992#0" expanded="true" />
+            <element signature="e#4053#4054#0" expanded="true" />
+            <element signature="e#4107#4108#0" expanded="true" />
+            <element signature="e#4186#4187#0" expanded="true" />
+            <element signature="e#4225#4226#0" expanded="true" />
+            <element signature="e#4289#4290#0" expanded="true" />
+            <element signature="e#4345#4346#0" expanded="true" />
+            <element signature="e#4430#4431#0" expanded="true" />
+            <element signature="e#4474#4475#0" expanded="true" />
+            <element signature="e#4698#4699#0" expanded="true" />
+            <element signature="e#4740#4741#0" expanded="true" />
+            <element signature="e#4810#4811#0" expanded="true" />
+            <element signature="e#4872#4873#0" expanded="true" />
+            <element signature="e#4955#4956#0" expanded="true" />
+            <element signature="e#4994#4995#0" expanded="true" />
+            <element signature="e#5058#5059#0" expanded="true" />
+            <element signature="e#5114#5115#0" expanded="true" />
+            <element signature="e#5194#5195#0" expanded="true" />
+            <element signature="e#5233#5234#0" expanded="true" />
+            <element signature="e#5297#5298#0" expanded="true" />
+            <element signature="e#5353#5354#0" expanded="true" />
+            <element signature="e#5428#5429#0" expanded="true" />
+            <element signature="e#5462#5463#0" expanded="true" />
+            <element signature="e#5516#5517#0" expanded="true" />
+            <element signature="e#5562#5563#0" expanded="true" />
+            <element signature="e#5634#5635#0" expanded="true" />
+            <element signature="e#5670#5671#0" expanded="true" />
+            <element signature="e#5728#5729#0" expanded="true" />
+            <element signature="e#5778#5779#0" expanded="true" />
+            <element signature="e#5852#5853#0" expanded="true" />
+            <element signature="e#5888#5889#0" expanded="true" />
+            <element signature="e#5946#5947#0" expanded="true" />
+            <element signature="e#5996#5997#0" expanded="true" />
+            <element signature="e#6067#6068#0" expanded="true" />
+            <element signature="e#6100#6101#0" expanded="true" />
+            <element signature="e#6152#6153#0" expanded="true" />
+            <element signature="e#6196#6197#0" expanded="true" />
+            <element signature="e#6261#6262#0" expanded="true" />
+            <element signature="e#6291#6292#0" expanded="true" />
+            <element signature="e#6337#6338#0" expanded="true" />
+            <element signature="e#6375#6376#0" expanded="true" />
+            <element signature="e#6437#6438#0" expanded="true" />
+            <element signature="e#6467#6468#0" expanded="true" />
+            <element signature="e#6513#6514#0" expanded="true" />
+            <element signature="e#6551#6552#0" expanded="true" />
+            <element signature="e#6613#6614#0" expanded="true" />
+            <element signature="e#6643#6644#0" expanded="true" />
+            <element signature="e#6689#6690#0" expanded="true" />
+            <element signature="e#6727#6728#0" expanded="true" />
+            <element signature="e#6796#6797#0" expanded="true" />
+            <element signature="e#6829#6830#0" expanded="true" />
+            <element signature="e#6881#6882#0" expanded="true" />
+            <element signature="e#6925#6926#0" expanded="true" />
+            <element signature="e#6995#6996#0" expanded="true" />
+            <element signature="e#7030#7031#0" expanded="true" />
+            <element signature="e#7086#7087#0" expanded="true" />
+            <element signature="e#7134#7135#0" expanded="true" />
+            <element signature="e#7202#7203#0" expanded="true" />
+            <element signature="e#7233#7234#0" expanded="true" />
+            <element signature="e#7281#7282#0" expanded="true" />
+            <element signature="e#7321#7322#0" expanded="true" />
+            <element signature="e#7390#7391#0" expanded="true" />
+            <element signature="e#7426#7427#0" expanded="true" />
+            <element signature="e#7484#7485#0" expanded="true" />
+            <element signature="e#7534#7535#0" expanded="true" />
+            <element signature="e#7602#7603#0" expanded="true" />
+            <element signature="e#7636#7637#0" expanded="true" />
+            <element signature="e#7690#7691#0" expanded="true" />
+            <element signature="e#7736#7737#0" expanded="true" />
+            <element signature="e#7806#7807#0" expanded="true" />
+            <element signature="e#7840#7841#0" expanded="true" />
+            <element signature="e#7894#7895#0" expanded="true" />
+            <element signature="e#7940#7941#0" expanded="true" />
+            <element signature="e#8006#8007#0" expanded="true" />
+            <element signature="e#8036#8037#0" expanded="true" />
+            <element signature="e#8082#8083#0" expanded="true" />
+            <element signature="e#8120#8121#0" expanded="true" />
+            <element signature="e#8189#8190#0" expanded="true" />
+            <element signature="e#8226#8227#0" expanded="true" />
+            <element signature="e#8286#8287#0" expanded="true" />
+            <element signature="e#8338#8339#0" expanded="true" />
+            <element signature="e#8417#8418#0" expanded="true" />
+            <element signature="e#8457#8458#0" expanded="true" />
+            <element signature="e#8523#8524#0" expanded="true" />
+            <element signature="e#8581#8582#0" expanded="true" />
+            <element signature="e#8655#8656#0" expanded="true" />
+            <element signature="e#8687#8688#0" expanded="true" />
+            <element signature="e#8737#8738#0" expanded="true" />
+            <element signature="e#8779#8780#0" expanded="true" />
+            <element signature="e#8846#8847#0" expanded="true" />
+            <element signature="e#8879#8880#0" expanded="true" />
+            <element signature="e#8931#8932#0" expanded="true" />
+            <element signature="e#8975#8976#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#787#788#0" expanded="true" />
+            <element signature="e#817#818#0" expanded="true" />
+            <element signature="e#2105#2106#0" expanded="true" />
+            <element signature="e#2135#2136#0" expanded="true" />
+            <element signature="e#2431#2432#0" expanded="true" />
+            <element signature="e#2461#2462#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index 854f1f1..0db633a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -165,12 +165,16 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String startDay,String endDay) {
+    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew) {
         try {
 
             Criteria criteria = createCriteria(PgAlarm.class);
             criteria.addOrder(Order.desc("id"));
 
+            if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) {
+                criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
+            }
+
             if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay))
             {
                 criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay)));
@@ -193,9 +197,11 @@
 
                 criteria.add(Restrictions.le("alarmDate",date));
             }
+            if(StringUtils.isNotBlank(isNew)&&isNew.equals("true"))
+                criteria.add(Restrictions.eq("active", 1));
 
             List<PgAlarm> pgAlarmList = criteria.list();
-            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
     }
 
     //根据设备位置(仓位)获取摄像机列表
-    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+    public List<PgDeviceDto> getPgCameraListByPosition(String partition,String position){
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.like("position",position+"%"));
-//        criteria.add(Restrictions.eq("devType","球机"));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(position))
+            criteria.add(Restrictions.like("position",position+"%"));
+
         criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
 
         List<PgDevice> pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
             dto.setDevCode(objects[5].toString());
             dto.setDevType(objects[6].toString());
             if(objects[7]!=null)
-            dto.setIp(objects[7].toString());
+                dto.setIp(objects[7].toString());
             dto.setIsOpen(objects[8].toString());
             dto.setPartition(objects[11].toString());
             dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index 8ebf74d..3c657a7 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgEquipment;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
 import com.casic.PgInterface.devTable.dto.PgEquipmentDto;
@@ -34,9 +35,12 @@
     public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
-        criteria.add(Restrictions.eq("eqName",eqName));
-        criteria.add(Restrictions.eq("eqCode",eqCode));
-        criteria.add(Restrictions.eq("eqType",eqType));
+        if(StringUtils.isNotBlank(eqName))
+            criteria.add(Restrictions.eq("eqName",eqName));
+        if(StringUtils.isNotBlank(eqCode))
+            criteria.add(Restrictions.eq("eqCode",eqCode));
+        if(StringUtils.isNotBlank(eqType))
+            criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
@@ -51,10 +55,9 @@
 
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
-        //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
         String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
-        +eqType+"' group by equipment.EQ_NAME";
+                +eqType+"' group by equipment.EQ_NAME";
 
         List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4ed68e4..e413a5c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
@@ -39,7 +40,8 @@
 
     public List<PgPipeLineDto> getPipeLineByLineType(String lineType) {
         Criteria criteria = createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineType", lineType));
+        if(StringUtils.isNotBlank(lineType))
+            criteria.add(Restrictions.eq("lineType", lineType));
 
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    private Long id;
-    private String keyId;//巡检记录单id
-    private String planId;//巡检计划ID
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    @Column(name="KEY_ID")
-    public String getKeyId() {
-        return keyId;
-    }
-
-    public void setKeyId(String keyId) {
-        this.keyId = keyId;
-    }
-
-    @Column(name="PLAN_ID")
-    public String getPlanId() {
-        return planId;
-    }
-
-    public void setPlanId(String planId) {
-        this.planId = planId;
-    }
-
-    @Column(name="CREATE_DATE")
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    @Column(name="STATE")
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    @Column(name="CREATOR")
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    @Column(name="PLAN_NAME")
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    @Column(name="RECORD_NO")
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    @Column(name="PLAN_NO")
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    @Column(name="RESPONSIBIE_DEPT")
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    @Column(name="INSPECTION_PERSON")
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    @Column(name="PATROL_MAN")
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    @Column(name="OPERATE_DATE")
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    @Column(name="REMARK")
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Column(name="BUILD_CABIN")
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    @Column(name="PROJECT")
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    @Column(name="START_PILE_NO")
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    @Column(name="END_PILE_NO")
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    @Column(name="INSPECTION_PRACE")
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    @Column(name="OTHER_PATROL_MAN")
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private Long id;
+    private String KEY_ID;//唯一键值
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_PERSON;//巡检人
+    private String START_DATE;//巡检开始时间
+    private String END_DATE;
+    private String FREQUENCY;//巡检频率
+    private String STATE;//状态
+    private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+    private String PLAN_NO;//巡检计划编号
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_MODE;//巡检方式
+    private String INSPECTION_ROUTE;//巡检路线
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String INSPECTION_GROUP;//巡检部门
+    private String INSERT_TIME;//插入时间
+    private String FREQUENCYDATE;//巡检具体日期
+    private String FREQUENCYTIME;//巡检具体时间
+    private String CREATEDATE;//创建时间
+    private String CREATOR;//创建人
+    private String PROJECT;//项目
+    private String COMLILE;//编制人
+    private String START_TIME;//编制时间
+    private String DEVELOP_DEPT;//制定部门
+    private String END_TIME;//结束时间
+    private String START_PILE_NO;//开始桩号
+    private String END_PILE_NO;//结束桩号
+    private String BUILD_CABIN;//巡检舱室
+    private String MILEAGE;
+    private String FREQUENCY_TIME;//巡检具体时间
+    private String FREQUENCYTIME_END;
+    private String KETTLE_TS;
+    private String UPDATEDATE;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="KEY_ID")
+    public String getKEY_ID() {
+        return KEY_ID;
+    }
+
+    public void setKEY_ID(String KEY_ID) {
+        this.KEY_ID = KEY_ID;
+    }
+
+    @Column(name="PLAN_NAME")
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    @Column(name="INSPECTION_PERSON")
+    public String getINSPECTION_PERSON() {
+        return INSPECTION_PERSON;
+    }
+
+    public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+        this.INSPECTION_PERSON = INSPECTION_PERSON;
+    }
+
+    @Column(name="START_DATE")
+    public String getSTART_DATE() {
+        return START_DATE;
+    }
+
+    public void setSTART_DATE(String START_DATE) {
+        this.START_DATE = START_DATE;
+    }
+
+    @Column(name="END_DATE")
+    public String getEND_DATE() {
+        return END_DATE;
+    }
+
+    public void setEND_DATE(String END_DATE) {
+        this.END_DATE = END_DATE;
+    }
+
+    @Column(name="FREQUENCY")
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    @Column(name="STATE")
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    @Column(name="RESPONSIBLE_DEPT")
+    public String getRESPONSIBLE_DEPT() {
+        return RESPONSIBLE_DEPT;
+    }
+
+    public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+        this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+    }
+
+    @Column(name="PLAN_NO")
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    @Column(name="INSPECTION_TYPE")
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    @Column(name="INSPECTION_MODE")
+    public String getINSPECTION_MODE() {
+        return INSPECTION_MODE;
+    }
+
+    public void setINSPECTION_MODE(String INSPECTION_MODE) {
+        this.INSPECTION_MODE = INSPECTION_MODE;
+    }
+
+    @Column(name="INSPECTION_ROUTE")
+    public String getINSPECTION_ROUTE() {
+        return INSPECTION_ROUTE;
+    }
+
+    public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+        this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+    }
+
+    @Column(name="INSPECTION_START_TIME")
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    @Column(name="INSPECTION_END_TIME")
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    @Column(name="INSPECTION_PRACE")
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    @Column(name="INSPECTION_GROUP")
+    public String getINSPECTION_GROUP() {
+        return INSPECTION_GROUP;
+    }
+
+    public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+        this.INSPECTION_GROUP = INSPECTION_GROUP;
+    }
+
+    @Column(name="INSERT_TIME")
+    public String getINSERT_TIME() {
+        return INSERT_TIME;
+    }
+
+    public void setINSERT_TIME(String INSERT_TIME) {
+        this.INSERT_TIME = INSERT_TIME;
+    }
+
+    @Column(name="FREQUENCYDATE")
+    public String getFREQUENCYDATE() {
+        return FREQUENCYDATE;
+    }
+
+    public void setFREQUENCYDATE(String FREQUENCYDATE) {
+        this.FREQUENCYDATE = FREQUENCYDATE;
+    }
+
+    @Column(name="FREQUENCYTIME")
+    public String getFREQUENCYTIME() {
+        return FREQUENCYTIME;
+    }
+
+    public void setFREQUENCYTIME(String FREQUENCYTIME) {
+        this.FREQUENCYTIME = FREQUENCYTIME;
+    }
+
+    @Column(name="CREATEDATE")
+    public String getCREATEDATE() {
+        return CREATEDATE;
+    }
+
+    public void setCREATEDATE(String CREATEDATE) {
+        this.CREATEDATE = CREATEDATE;
+    }
+
+    @Column(name="CREATOR")
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    @Column(name="PROJECT")
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    @Column(name="COMLILE")
+    public String getCOMLILE() {
+        return COMLILE;
+    }
+
+    public void setCOMLILE(String COMLILE) {
+        this.COMLILE = COMLILE;
+    }
+
+    @Column(name="START_TIME")
+    public String getSTART_TIME() {
+        return START_TIME;
+    }
+
+    public void setSTART_TIME(String START_TIME) {
+        this.START_TIME = START_TIME;
+    }
+
+    @Column(name="DEVELOP_DEPT")
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    @Column(name="END_TIME")
+    public String getEND_TIME() {
+        return END_TIME;
+    }
+
+    public void setEND_TIME(String END_TIME) {
+        this.END_TIME = END_TIME;
+    }
+
+    @Column(name="START_PILE_NO")
+    public String getSTART_PILE_NO() {
+        return START_PILE_NO;
+    }
+
+    public void setSTART_PILE_NO(String START_PILE_NO) {
+        this.START_PILE_NO = START_PILE_NO;
+    }
+
+    @Column(name="END_PILE_NO")
+    public String getEND_PILE_NO() {
+        return END_PILE_NO;
+    }
+
+    public void setEND_PILE_NO(String END_PILE_NO) {
+        this.END_PILE_NO = END_PILE_NO;
+    }
+
+    @Column(name="BUILD_CABIN")
+    public String getBUILD_CABIN() {
+        return BUILD_CABIN;
+    }
+
+    public void setBUILD_CABIN(String BUILD_CABIN) {
+        this.BUILD_CABIN = BUILD_CABIN;
+    }
+
+    @Column(name="MILEAGE")
+    public String getMILEAGE() {
+        return MILEAGE;
+    }
+
+    public void setMILEAGE(String MILEAGE) {
+        this.MILEAGE = MILEAGE;
+    }
+
+    @Column(name="FREQUENCY_TIME")
+    public String getFREQUENCY_TIME() {
+        return FREQUENCY_TIME;
+    }
+
+    public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+        this.FREQUENCY_TIME = FREQUENCY_TIME;
+    }
+
+    @Column(name="FREQUENCYTIME_END")
+    public String getFREQUENCYTIME_END() {
+        return FREQUENCYTIME_END;
+    }
+
+    public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+        this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+    }
+
+    @Column(name="KETTLE_TS")
+    public String getKETTLE_TS() {
+        return KETTLE_TS;
+    }
+
+    public void setKETTLE_TS(String KETTLE_TS) {
+        this.KETTLE_TS = KETTLE_TS;
+    }
+
+    @Column(name="UPDATEDATE")
+    public String getUPDATEDATE() {
+        return UPDATEDATE;
+    }
+
+    public void setUPDATEDATE(String UPDATEDATE) {
+        this.UPDATEDATE = UPDATEDATE;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 5346b57..2f8d359 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -66,7 +66,7 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REPAIRMAN")
+    @Column(name="REOAIRMAN")
     public String getRepairMan() {
         return repairMan;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
-    private Long id;
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-
-
-    public static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
-        PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
-        pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
-        pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
-        pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
-        pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
-        pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
-        pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
-        pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
-        pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
-        pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
-        pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
-        pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
-        pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
-        pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
-        pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
-        return pgAssetInSpectionRecordDto;
-    }
-
-
-    public static List<PgAssetInSpectionRecordDto> ConvertToDtoList(List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList){
-        List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-        for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
-            pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
-        }
-
-        return pgAssetInSpectionRecordDtoList;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
-    private String num;
-    private String createDate;
-
-    public String getNum() {
-        return num;
-    }
-
-    public void setNum(String num) {
-        this.num = num;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+    private Long id;
+    private String PLAN_NO;//巡检计划编号
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String FREQUENCY;//巡检频率
+    private String CREATOR;//创建人
+    private String DEVELOP_DEPT;//制定部门
+    private String PROJECT;//项目
+    private String STATE;//状态
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+        PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+        pgAssetPlanDto.setId(pgAssetPlan.getId());
+        pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+        pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+        pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+        pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+        pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+        pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+        pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+        pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+        pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+        pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+        pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+        return pgAssetPlanDto;
+    }
+
+    public static List<PgAssetPlanDto> ConvertToPgAssetDtoList(List<PgAssetPlan> pgAssetPlanList){
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
+
+        for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+            pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+        }
+
+        return pgAssetPlanDtoList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
new file mode 100644
index 0000000..bc12db1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
@@ -0,0 +1,24 @@
+package com.casic.PgInterface.maintenance.dto;
+
+public class PgAssetPlanStatic {
+
+    private String num;
+    private String createDate;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
deleted file mode 100644
index c41ca7d..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.casic.PgInterface.maintenance.manager;
-
-import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
-
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
-        try {
-            String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
-                    "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
-                    "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-
-            if(patrolMan!=null)
-                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
-            if(startTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
-            if(endTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')<to_date('"+endTime+"','yyyy-MM-dd')";
-
-            sql+=" order by id";
-
-            List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
-
-            List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList=new ArrayList<>();
-            for(Object[] objects1:objects){
-                PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord();
-
-                pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString()));
-                pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1]));
-                pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2]));
-                pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3]));
-                pgAssetInSpectionRecord.setState(String.valueOf(objects1[4]));
-                pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5]));
-                pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6]));
-                pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7]));
-                pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8]));
-                pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9]));
-                pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10]));
-                pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11]));
-                pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12]));
-                pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13]));
-                pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14]));
-                pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15]));
-                pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16]));
-                pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17]));
-                pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18]));
-                pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19]));
-
-                pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord);
-            }
-
-            List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-            for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList)
-            {
-                pgAssetInSpectionRecordDtoList.add(PgAssetInSpectionRecordDto.ConvertToDto(pgAssetInSpectionRecord));
-            }
-
-            return pgAssetInSpectionRecordDtoList;
-        }
-        catch(Exception e)
-        {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public List<PgAssetInSpectionRecordStatic> getPgAssetInSpectionRecordStaticLisByTime(
-            String startTime, String endTime, String staticType) {
-
-        String sql="";
-        String dateType="";
-        List<PgAssetInSpectionRecordStatic> pgAssetInSpectionRecordStaticList=new ArrayList<>();
-        int type=Integer.valueOf(staticType);
-
-        switch(type) {
-            case 0://年
-                dateType = "yyyy";
-                break;
-            case 1://月
-                dateType = "yyyy-mm";
-                break;
-            case 2://周
-                dateType = "iw";
-                break;
-            case 3://日
-                dateType="yyyy-mm-dd";
-                break;
-            default:
-                break;
-        }
-
-        sql="select count(*), to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_RECORD t where 1=1";
-
-        if(startTime!=null)
-            sql+=" and t.CREATE_DATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
-        if(endTime!=null)
-            sql+=" and t.CREATE_DATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
-
-        sql+=" group by to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"')";
-
-        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
-        for(int i=0;i<objects.size();i++)
-        {
-            PgAssetInSpectionRecordStatic pgAssetInSpectionRecordStatic=new PgAssetInSpectionRecordStatic();
-            pgAssetInSpectionRecordStatic.setNum(objects.get(i)[0].toString());
-            pgAssetInSpectionRecordStatic.setCreateDate(objects.get(i)[1].toString());
-            pgAssetInSpectionRecordStaticList.add(pgAssetInSpectionRecordStatic);
-        }
-        return pgAssetInSpectionRecordStaticList;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
new file mode 100644
index 0000000..bb6bf1e
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
@@ -0,0 +1,81 @@
+package com.casic.PgInterface.maintenance.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgAssetPlanManager extends HibernateEntityDao<PgAssetPlan> {
+
+    public List<PgAssetPlanDto> getPgAssetPlanDtoList(String inSpectionPlace){
+        Criteria criteria=createCriteria(PgAssetPlan.class);
+
+        if(StringUtils.isNotBlank(inSpectionPlace))
+            criteria.add(Restrictions.like("INSPECTION_PRACE","%"+inSpectionPlace+"%"));
+        criteria.addOrder(Order.desc("id"));
+
+        List<PgAssetPlan> pgAssetPlanList=criteria.list();
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=PgAssetPlanDto.ConvertToPgAssetDtoList(pgAssetPlanList);
+
+        if(pgAssetPlanDtoList==null||pgAssetPlanDtoList.size()==0)
+            return null;
+        else
+            return pgAssetPlanDtoList;
+    }
+
+    public List<PgAssetPlanStatic> getPgAssetPlanStaticLisByTime(
+            String startTime, String endTime, String staticType) {
+
+        String sql="";
+        String dateType="";
+        List<PgAssetPlanStatic> pgAssetPlanStaticList=new ArrayList<>();
+        int type=Integer.valueOf(staticType);
+
+        switch(type) {
+            case 0://年
+                dateType = "yyyy";
+                break;
+            case 1://月
+                dateType = "yyyy-mm";
+                break;
+            case 2://周
+                dateType = "iw";
+                break;
+            case 3://日
+                dateType="yyyy-mm-dd";
+                break;
+            default:
+                break;
+        }
+
+        sql="select count(*), to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_PLAN t where 1=1";
+
+        if(startTime!=null)
+            sql+=" and t.CREATEDATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
+        if(endTime!=null)
+            sql+=" and t.CREATEDATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
+
+        sql+=" group by to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"')";
+
+        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
+        for(int i=0;i<objects.size();i++)
+        {
+            PgAssetPlanStatic pgAssetPlanStatic=new PgAssetPlanStatic();
+            pgAssetPlanStatic.setNum(objects.get(i)[0].toString());
+            pgAssetPlanStatic.setCreateDate(objects.get(i)[1].toString());
+            pgAssetPlanStaticList.add(pgAssetPlanStatic);
+        }
+        return pgAssetPlanStaticList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 0903f22..3484739 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -15,7 +15,7 @@
 
     public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
             if(repairMan!=null)
                 sql+=" and REPAIRMAN like '%"+repairMan+"%'";
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index 9cc2881..6d90d7b 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -1,5 +1,7 @@
 package com.casic.PgInterface.patroler.dto;
 
+import com.casic.PgInterface.devTable.domain.PgDevice;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 
 /**
@@ -14,6 +16,7 @@
     private String unit;//单位
     private String alarmType;//报警类型
     private Long pgDeviceId;//设备编号
+    private String assetCode;//资产编号
 
     public Long getId() {
         return id;
@@ -71,7 +74,15 @@
         this.pgDeviceId = pgDeviceId;
     }
 
-    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
+    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule, PgDeviceManager pgDeviceManager) {
         this.setId(pgAlarmRule.getId());
         this.setHighValue(pgAlarmRule.getHighValue());
         this.setLowValue(pgAlarmRule.getLowValue());
@@ -82,6 +93,10 @@
         else
             this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
         this.setPgDeviceId(pgAlarmRule.getPgDeviceId());
+        if(pgAlarmRule.getAlarmTypeId()!=null&&pgDeviceManager.get(pgAlarmRule.getPgDeviceId())!=null)
+            this.setAssetCode(pgDeviceManager.get(pgAlarmRule.getPgDeviceId()).getAssetCode());
+        else
+            this.setAssetCode("");
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
index c132c98..a7cef5b 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
@@ -1,13 +1,17 @@
 package com.casic.PgInterface.patroler.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.ResponseStatus;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -17,30 +21,23 @@
 @Service
 public class PgAlarmRuleManager extends HibernateEntityDao<PgAlarmRule> {
 
+    @Resource
+    private PgDeviceManager pgDeviceManager;
+
     //根据设备获取设备报警阈值
-    public List<PgAlarmRuleDto>  getAlarmRuleDto() {
+    public List<PgAlarmRuleDto>  getAlarmRuleDto(String devType) {
         Criteria criteria=createCriteria(PgAlarmRule.class);
+
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.eq("devType", devType));
         criteria.addOrder(Order.desc("id"));
 
         List<PgAlarmRule> pgAlarmRuleList=criteria.list();
-        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
+        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         for (PgAlarmRule pgAlarmRule : pgAlarmRuleList) {
-            pgAlarmRuleDtoList.add(new PgAlarmRuleDto(pgAlarmRule));
+            pgAlarmRuleDtoList.add(new PgAlarmRuleDto(pgAlarmRule,pgDeviceManager));
         }
         return pgAlarmRuleDtoList;
-
     }
 
-    public PgAlarmRule getAlarmRuleBydevType(String devType) {
-        Criteria criteria=createCriteria(PgAlarmRule.class);
-        criteria.add(Restrictions.eq("devType", devType));
-
-        List<PgAlarmRule> pgAlarmRuleList=criteria.list();
-
-        if(pgAlarmRuleList==null||pgAlarmRuleList.size()==0)
-            return null;
-        else
-            return pgAlarmRuleList.get(0);
-    }
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index d0e28f5..082ba5d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgAlarm;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
@@ -39,7 +40,7 @@
     private PgReservePlanManager pgReservePlanManager;
 
     /*
-    * 获取报警设备信息
+     * 获取报警设备信息
      */
     @POST
     @Path("linkDevice")
@@ -50,11 +51,22 @@
 
         PgDeviceDto pgDeviceDto = null;
         try {
-            PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
-            PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
-
-            pgDeviceDto=new PgDeviceDto(pgDevice);
-            msg = "报警关联设备获取成功";
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if (pgAlarm == null)
+                    msg = "不存在报警信息";
+                else {
+                    PgDevice pgDevice = pgAlarm.getAlarmDevId();
+                    if (pgDevice == null)
+                        msg = "不存在报警设备";
+                    else {
+                        pgDeviceDto = new PgDeviceDto(pgDevice);
+                        msg = "报警关联设备获取成功";
+                    }
+                }
+            }
+            else
+                msg="未接受到报警设备ID信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取关联设备失败";
@@ -77,11 +89,28 @@
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
-            PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
-            PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
-            pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if(pgAlarm==null)
+                    msg="不存在报警信息";
+                else {
+                    PgDevice pgDevice = pgAlarm.getAlarmDevId();
+                    if (pgDevice == null)
+                        msg = "不存在报警设备";
+                    else {
+                        String strPosition=pgDevice.getPosition();
+                        String position="";
+                        if(!strPosition.equals(""))
+                            position=pgDevice.getPosition().substring(0,3);
+                        String partition=pgDevice.getPartition();
 
-            msg = "关联设备获取成功";
+                        pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
+                        msg = "关联设备获取成功";
+                    }
+                }
+            }
+            else
+                msg="请输入报警设备Id信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "分区设备关联失败";
@@ -93,7 +122,7 @@
 
     /*
      * 根据报警记录获取关联的预案
-    */
+     */
     @POST
     @Path("linkReservePlan")
     @Produces(MediaType.APPLICATION_JSON)
@@ -103,10 +132,21 @@
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
-            PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
-            pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if (pgAlarm == null)
+                    msg = "不存在报警信息";
+                else {
+                    pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-            msg="关联预案获取成功";
+                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
+                        msg="不存在关联的报警预案";
+                    else
+                        msg = "关联预案获取成功";
+                }
+            }
+            else
+                msg="请输入报警信息";
         }
         catch(Exception e)
         {
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index d18ebb8..baacd93 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -48,14 +48,16 @@
     @POST
     @Path("getAlarmInfo")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmList(@FormParam("startDay") String startDay,
-                                            @FormParam("endDay") String endDay) throws Exception {
+    public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
+                                            @FormParam("startDay") String startDay,
+                                            @FormParam("endDay") String endDay,
+                                            @FormParam("isNew") String isNew) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(startDay,endDay);
-            if (pgAlarmDtoList.size() == 0)
+            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew);
+            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
                 msg = "没有报警信息";
             else
                 msg = "报警信息获取成功";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 87afd54..29ce8a4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -1,7 +1,5 @@
 package com.casic.PgInterface.rs;
 
-import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager;
-import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import com.casic.PgInterface.patroler.manager.PgAlarmRuleManager;
@@ -30,119 +28,23 @@
     private static Logger logger = LoggerFactory.getLogger(PgAlarmRule.class);
 
     @Resource
-    private PgDeviceManager pgDeviceManager;
-    @Resource
-    private PgAlarmTypeManager pgAlarmTypeManager;
-    @Resource
     private PgAlarmRuleManager pgAlarmRuleManager;
 
-
-
-    /**
-     * 新增报警阈值
-     */
-    @POST
-    @Path("addAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> addAlarmRule(@FormParam("highValue") String highValue,
-                                            @FormParam("lowValue") String lowValue,
-                                            @FormParam("unit") String unit,
-                                            @FormParam("devType") String devType,
-                                            @FormParam("alarmType") String alarmType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType);
-            if (pgAlarmRule != null) {
-                result = "false";
-                msg = "设备阈值已经存在";
-            } else {
-                pgAlarmRule = new PgAlarmRule();
-                pgAlarmRule.setHighValue(highValue);
-                pgAlarmRule.setLowValue(lowValue);
-                pgAlarmRule.setDevType(devType);
-                pgAlarmRule.setUnit(unit);
-                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
-
-                pgAlarmRuleManager.save(pgAlarmRule);
-                result = "true";
-                msg = "报警阈值新增成功";
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = "false";
-            msg = "报警阈值新增失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-        return resultMap;
-    }
-
-    /**
-     * 编辑报警阈值
-     */
-    @POST
-    @Path("editAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> editAlarmRule(@FormParam("id") String id,
-                                             @FormParam("devType") String devType,
-                                             @FormParam("highValue") String highValue,
-                                             @FormParam("lowValue") String lowValue,
-                                             @FormParam("unit") String unit,
-                                             @FormParam("alarmType") String alarmType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
-            if (pgAlarmRule == null) {
-                msg = "不存在报警阈值记录";
-                result = "false";
-            } else {
-                pgAlarmRule.setDevType(devType);
-                pgAlarmRule.setHighValue(highValue);
-                pgAlarmRule.setLowValue(lowValue);
-                pgAlarmRule.setUnit(unit);
-                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
-
-                pgAlarmRuleManager.save(pgAlarmRule);
-                msg = "编辑成功";
-                result = "true";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            result = "false";
-            msg = "报警阈值编辑失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-
-        return resultMap;
-    }
-
     /**
      * 获取报警阈值信息
      */
     @POST
     @Path("getAlarmRule")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmRule() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+    public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
+        System.out.println("devType:"+devType);
+        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
-            pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto();
-            if (pgAlarmRuleDtoList == null)
+            pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
+            if (pgAlarmRuleDtoList == null||pgAlarmRuleDtoList.size()==0)
                 msg = "不存在报警阈值信息";
             else
                 msg = "报警阈值获取成功";
@@ -155,69 +57,4 @@
         return resultMap;
     }
 
-    /**
-     * 删除报警阈值
-     */
-    @POST
-    @Path("deleteAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> deleteAlarmRule(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
-            if (pgAlarmRule == null) {
-                msg = "不存在报警阈值记录";
-                result = "false";
-            } else {
-                pgAlarmRuleManager.remove(pgAlarmRule);
-                msg = "删除成功";
-                result = "true";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            result = "false";
-            msg = "报警阈值删除失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-
-        return resultMap;
-    }
-
-    /**
-     * 根据设备类型报警阈值
-     */
-    @POST
-    @Path("getAlarmRuleByDevType")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmRuleByDevType(@FormParam("devType") String devType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        PgAlarmRule pgAlarmRule = null;
-        List<PgAlarmRuleDto> pgAlarmRuleDtos = new ArrayList<>();
-        try {
-            pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType);
-            if (pgAlarmRule == null)
-                msg = "不存在报警阈值记录";
-            else {
-                PgAlarmRuleDto pgAlarmRuleDto= new PgAlarmRuleDto(pgAlarmRule);
-                pgAlarmRuleDtos.add(pgAlarmRuleDto);
-                msg = "报警阈值获取成功";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            msg = "报警阈值获取失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmRuleDtos);
-
-        return resultMap;
-    }
-
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
new file mode 100644
index 0000000..19d3b8c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanRs")
+public class PgAssetPlanRs {
+
+    @Resource
+    private PgAssetPlanManager pgAssetPlanManager;
+
+    /**
+     * 获取巡检记录
+     */
+    @POST
+    @Path("getPgAssetPlanList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPgAssetPlanList(@FormParam("inSpectionPlace") String inSpectionPlace){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
+        try{
+            pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(inSpectionPlace);
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
+                msg="巡检信息获取成功";
+            else
+                msg="不存在巡检信息";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="巡检信息获取失败";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAssetPlanDtoList);
+
+        return resultMap;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
new file mode 100644
index 0000000..47ef9d1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanStaticRs")
+public class PgAssetPlanStaticRs {
+
+    @Resource
+    private PgAssetPlanManager pgAssetPlanManager;
+
+    @POST
+    @Path("getPgAssetPlanStaticList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPgAssetPlanStaticList(@FormParam("startTime") String startTime,
+                                                       @FormParam("endTime") String endTime,
+                                                       @FormParam("staticType") String staticType) throws Exception{
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
+        try{
+            pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
+                msg="巡检统计信息获取成功";
+            else
+                msg="统计信息获取失败";
+        }
+        catch (Exception ex){
+            ex.printStackTrace();
+            msg="统计失败";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAssetPlanStaticList);
+
+        return resultMap;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
deleted file mode 100644
index 66f4d09..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.manager.PgAssetInSpectionRecordManager;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@Path("pgAssetRecordRs")
-public class PgAssetRecordRs {
-
-    @Resource
-    private PgAssetInSpectionRecordManager pgAssetInSpectionRecordManager;
-
-    /**
-     * 获取巡检记录
-     */
-    @POST
-    @Path("getPgAssetRecordList")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgAssetRecordList(@FormParam("patrolMan") String patrolMan,
-                                                   @FormParam("startTime") String startTime,
-                                                   @FormParam("endTime") String endTime){
-        Map<String,Object> resultMap=new HashMap<>();
-        String msg="";
-
-        List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-        try{
-            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(patrolMan,startTime,endTime);
-            if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0)
-                msg="巡检信息获取成功";
-            else
-                msg="不存在巡检信息";
-        }
-        catch(Exception ex){
-            ex.printStackTrace();
-            msg="巡检信息获取失败";
-        }
-
-        resultMap.put("msg",msg);
-        resultMap.put("result",pgAssetInSpectionRecordDtoList);
-
-        return resultMap;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java
deleted file mode 100644
index 5f0417a..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import com.casic.PgInterface.maintenance.manager.PgAssetInSpectionRecordManager;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@Path("pgAssetRecordStaticRs")
-public class PgAssetRecordStaticRs {
-
-    @Resource
-    private PgAssetInSpectionRecordManager pgAssetInSpectionRecordManager;
-
-    @POST
-    @Path("getPgAssetRecordHeadStaticList")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgAssetRecordHeadStaticList(@FormParam("startTime") String startTime,
-                                                                @FormParam("endTime") String endTime,
-                                                                @FormParam("staticType") String staticType) throws Exception{
-        Map<String,Object> resultMap=new HashMap<>();
-        String msg="";
-        String result="";
-
-        List<PgAssetInSpectionRecordStatic> pgAssetInSpectionRecordStaticList = null;
-        try{
-            pgAssetInSpectionRecordStaticList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetInSpectionRecordStaticList!=null&&pgAssetInSpectionRecordStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
-            else
-                msg="统计信息获取失败";
-        }
-        catch (Exception ex){
-            ex.printStackTrace();
-            msg="统计失败";
-        }
-
-        resultMap.put("msg",msg);
-        resultMap.put("result",pgAssetInSpectionRecordStaticList);
-
-        return resultMap;
-    }
-
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index 9dfdd88..a0245ba 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -326,7 +326,7 @@
 
             PgConstruction pgConstruction=pgConstructionManager.get(Long.valueOf(id));
 
-            pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(pgConstruction.getPgName());
+            pgDeviceDtoList=pgDeviceManager.getPgCameraListByPartition(pgConstruction.getPgName());
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index 1c8130c..c276fb3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -177,6 +177,7 @@
             else
             {
                 pgEquipment.setActive(0);
+                pgEquipmentManager.save(pgEquipment);
                 msg="删除成功";
                 result="true";
             }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index 486b49f..f0b936c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -287,7 +287,7 @@
         try {
             if (apCode != "") {
                 String apCodeStr=apCode.substring(0,3);
-                pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(apCodeStr);
+                pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition("",apCodeStr);
                 if(pgDeviceDtoList==null)
                     msg="不存在关联摄像机";
                 else
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 982e3d9..a6da81e 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -11,15 +11,13 @@
 
 
 # ============================================================================
-# dbd
+# db
 # ============================================================================
 db.default.driverClassName=oracle.jdbc.driver.OracleDriver
-db.default.url=jdbc:oracle:thin:@172.17.0.201:1521:szgl
-#db.default.url=jdbc:oracle:thin:@119.254.103.80:1521:chengdu
-db.default.username=scott
-db.default.password=scott
-#db.default.username=PG
-#db.default.password=PG
+#db.default.url=jdbc:oracle:thin:@172.17.0.201:1521:szgl
+db.default.url=jdbc:oracle:thin:@119.254.103.80:1521:chengdu
+db.default.username=PG
+db.default.password=PG
 
 
 # ============================================================================
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190828.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190828.docx"
new file mode 100644
index 0000000..7920004
--- /dev/null
+++ "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190828.docx"
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190828.docx" "b/~$\350\257\264\346\230\21620190828.docx"
new file mode 100644
index 0000000..575ddd4
--- /dev/null
+++ "b/~$\350\257\264\346\230\21620190828.docx"
Binary files differ
diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\21620190726.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\21620190726.docx"
deleted file mode 100644
index d320e29..0000000
--- "a/\346\216\245\345\217\243\350\257\264\346\230\21620190726.docx"
+++ /dev/null
Binary files differ

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ff69e2a..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,27 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190828.docx" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -32,72 +42,119 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="2" />
-          <entry key="java" value="243" />
-          <entry key="properties" value="6" />
+          <entry key="java" value="321" />
+          <entry key="properties" value="8" />
           <entry key="xml" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
-          <entry key="JAVA" value="243" />
-          <entry key="Properties" value="6" />
+          <entry key="JAVA" value="321" />
+          <entry key="Properties" value="8" />
           <entry key="XML" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="8082" />
-          <entry key="properties" value="49" />
-          <entry key="txt" value="64" />
+          <entry key="dummy" value="16" />
+          <entry key="java" value="10723" />
+          <entry key="properties" value="59" />
+          <entry key="txt" value="118" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="8082" />
-          <entry key="PLAIN_TEXT" value="64" />
-          <entry key="Properties" value="49" />
+          <entry key="JAVA" value="10723" />
+          <entry key="PLAIN_TEXT" value="134" />
+          <entry key="Properties" value="59" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="4" />
+          <entry key="project.closed" value="28" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
           <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.24" value="1" />
+          <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="1" />
-          <entry key="project.open.time.3" value="3" />
-          <entry key="project.open.time.31" value="1" />
+          <entry key="project.open.time.28" value="1" />
+          <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.31" value="2" />
           <entry key="project.open.time.37" value="1" />
+          <entry key="project.open.time.39" value="2" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.40" value="1" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="1" />
+          <entry key="project.open.time.44" value="2" />
           <entry key="project.open.time.45" value="2" />
           <entry key="project.open.time.48" value="1" />
           <entry key="project.open.time.49" value="1" />
+          <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.58" value="1" />
           <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.71" value="1" />
+          <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.71" value="2" />
           <entry key="project.open.time.76" value="1" />
-          <entry key="project.opened" value="25" />
+          <entry key="project.opened" value="41" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+            <state relative-caret-position="174">
+              <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
               <folding>
-                <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-                <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="352">
+              <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#787#788#0" expanded="true" />
+                <element signature="e#817#818#0" expanded="true" />
+                <element signature="e#2105#2106#0" expanded="true" />
+                <element signature="e#2135#2136#0" expanded="true" />
+                <element signature="e#2431#2432#0" expanded="true" />
+                <element signature="e#2461#2462#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="638">
+              <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+              <folding>
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -122,6 +179,7 @@
       <find>getPgDeviceByDevType</find>
       <find>message</find>
       <find>getConstructionByType</find>
+      <find>getPgCameraListByPosition</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -130,24 +188,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanTypeDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
@@ -162,17 +207,38 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
       </list>
     </option>
   </component>
@@ -208,16 +274,18 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="3" />
-    <option name="y" value="10" />
-    <option name="width" value="1386" />
-    <option name="height" value="788" />
+    <option name="x" value="1410" />
+    <option name="y" value="117" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -258,7 +326,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -267,16 +335,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -286,7 +345,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="dto" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -296,7 +355,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="manager" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -308,19 +367,10 @@
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="webapp" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -359,6 +409,7 @@
       </deployment>
       <server-settings>
         <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_7" />
+        <option name="JNDI_PORT" value="10991" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -456,7 +507,23 @@
       <workItem from="1566350810712" duration="6803000" />
       <workItem from="1566435787074" duration="10717000" />
       <workItem from="1566521753529" duration="14265000" />
-      <workItem from="1566614176989" duration="5693000" />
+      <workItem from="1566614176989" duration="14059000" />
+      <workItem from="1566780822009" duration="1026000" />
+      <workItem from="1566891563975" duration="284000" />
+      <workItem from="1566893107340" duration="3382000" />
+      <workItem from="1566953794976" duration="11039000" />
+      <workItem from="1567059357700" duration="484000" />
+      <workItem from="1567082835097" duration="1086000" />
+      <workItem from="1567126428020" duration="1539000" />
+      <workItem from="1567129277820" duration="5788000" />
+      <workItem from="1567136008996" duration="2568000" />
+      <workItem from="1567237040302" duration="111000" />
+      <workItem from="1567495626345" duration="2797000" />
+      <workItem from="1567558770152" duration="2352000" />
+      <workItem from="1567577368149" duration="640000" />
+      <workItem from="1567751224608" duration="780000" />
+      <workItem from="1568019299799" duration="695000" />
+      <workItem from="1568082566133" duration="4016000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -493,17 +560,60 @@
       <option name="project" value="LOCAL" />
       <updated>1566553388171</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="整理管线部分">
+      <created>1566620046627</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1566620046627</updated>
+    </task>
+    <task id="LOCAL-00007" summary="合并代码提交">
+      <created>1566781001910</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1566781001910</updated>
+    </task>
+    <task id="LOCAL-00008" summary="合并代码提交">
+      <created>1566963831930</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1566963831930</updated>
+    </task>
+    <task id="LOCAL-00009" summary="修改报警阈值">
+      <created>1566972146710</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1566972146710</updated>
+    </task>
+    <task id="LOCAL-00010" summary="修改巡检维护表字段">
+      <created>1567126525554</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1567126525554</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="142930000" />
+    <option name="totallyTimeSpent" value="189883000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
+    <frame x="1358" y="-8" width="1456" height="916" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29297996" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -511,13 +621,14 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Thumbnails" weight="0.3295082" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.5081967" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.3849105" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
       <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
       <window_info anchor="bottom" id="Spring" order="8" />
       <window_info anchor="bottom" id="Terminal" order="9" />
@@ -539,7 +650,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2193646" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -547,22 +658,23 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.47540984" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
-      <window_info anchor="bottom" id="Spring" order="8" />
-      <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
-      <window_info anchor="bottom" id="Statistic" order="11" />
-      <window_info anchor="bottom" id="Java Enterprise" order="12" />
-      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="14" weight="0.32786885" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.52307695" />
+      <window_info anchor="bottom" id="Thumbnails" order="0" weight="0.3295082" />
+      <window_info anchor="bottom" id="Message" order="1" />
+      <window_info anchor="bottom" id="Find" order="2" />
+      <window_info anchor="bottom" id="Run" order="3" />
+      <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.49924356" weight="0.49344262" />
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Application Servers" order="8" weight="0.3276923" />
+      <window_info anchor="bottom" id="Spring" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
+      <window_info anchor="bottom" id="Statistic" order="12" />
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <window_info anchor="bottom" id="Database Changes" order="14" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="15" weight="0.32786885" />
+      <window_info anchor="bottom" id="Messages" order="16" weight="0.5229508" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -578,6 +690,16 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -587,7 +709,11 @@
     <MESSAGE value="修改权限问题" />
     <MESSAGE value="修改人员登录返回接口" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整理管线部分" />
+    <MESSAGE value="合并代码提交" />
+    <MESSAGE value="修改报警阈值" />
+    <MESSAGE value="修改巡检维护表字段" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护表字段" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -602,322 +728,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-532">
-          <caret line="50" column="28" lean-forward="true" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="19" column="60" selection-start-line="19" selection-start-column="60" selection-end-line="19" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="100" column="34" lean-forward="true" selection-start-line="100" selection-start-column="34" selection-end-line="100" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1474">
-          <caret line="84" column="58" selection-start-line="84" selection-start-column="58" selection-end-line="84" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1100">
-          <caret line="58" column="18" selection-start-line="58" selection-start-column="18" selection-end-line="58" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6842">
-          <caret line="329" selection-start-line="329" selection-end-line="329" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="102" column="24" lean-forward="true" selection-start-line="102" selection-start-column="24" selection-end-line="102" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="72" column="56" lean-forward="true" selection-start-line="72" selection-start-column="56" selection-end-line="72" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="90" column="39" lean-forward="true" selection-start-line="90" selection-start-column="39" selection-end-line="90" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="97" column="16" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
-          <caret line="14" column="52" lean-forward="true" selection-start-line="14" selection-start-column="52" selection-end-line="14" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="26" column="34" lean-forward="true" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="61" column="1" lean-forward="true" selection-start-line="61" selection-start-column="1" selection-end-line="61" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="208" column="49" lean-forward="true" selection-start-line="208" selection-start-column="49" selection-end-line="208" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="140" column="57" selection-start-line="140" selection-start-column="57" selection-end-line="140" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="111" column="36" selection-start-line="111" selection-start-column="36" selection-end-line="111" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="3" lean-forward="true" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="81" column="58" lean-forward="true" selection-start-line="81" selection-start-column="58" selection-end-line="81" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="472">
-          <caret line="118" column="59" selection-start-line="118" selection-start-column="59" selection-end-line="118" selection-end-column="59" />
-          <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-198">
-          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="69" column="32" lean-forward="true" selection-start-line="69" selection-start-column="32" selection-end-line="70" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="142" column="59" lean-forward="true" selection-start-line="142" selection-start-column="59" selection-end-line="142" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="349" column="9" lean-forward="true" selection-start-line="349" selection-start-column="9" selection-end-line="349" selection-end-column="9" />
-          <folding>
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="e#12105#12121#0" expanded="true" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-686">
-          <caret line="67" column="31" lean-forward="true" selection-start-line="67" selection-start-column="31" selection-end-line="67" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="93" column="24" lean-forward="true" selection-start-line="93" selection-start-column="24" selection-end-line="93" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="57" column="23" lean-forward="true" selection-start-line="57" selection-start-column="23" selection-end-line="57" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-408">
-          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="98" column="40" lean-forward="true" selection-start-line="98" selection-start-column="40" selection-end-line="98" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="572">
@@ -925,13 +735,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="328" column="32" lean-forward="true" selection-start-line="328" selection-start-column="32" selection-end-line="328" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
@@ -950,16 +753,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="396">
           <caret line="23" column="32" lean-forward="true" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
-          <folding>
-            <element signature="e#2635#2636#0" expanded="true" />
-            <element signature="e#2671#2672#0" expanded="true" />
-            <element signature="e#2727#2728#0" expanded="true" />
-            <element signature="e#2777#2778#0" expanded="true" />
-            <element signature="e#2877#2878#0" expanded="true" />
-            <element signature="e#2911#2912#0" expanded="true" />
-            <element signature="e#2963#2964#0" expanded="true" />
-            <element signature="e#3009#3010#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -972,14 +765,481 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+        <state relative-caret-position="66">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="59" column="46" lean-forward="true" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3586">
+          <caret line="179" column="16" selection-start-line="179" selection-start-column="16" selection-end-line="179" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5478">
+          <caret line="273" column="3" selection-start-line="273" selection-start-column="3" selection-end-line="273" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1870">
+          <caret line="147" column="11" selection-start-line="147" selection-start-column="11" selection-end-line="147" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="55" column="15" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="106">
+          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="290" column="41" lean-forward="true" selection-start-line="290" selection-start-column="41" selection-end-line="290" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="21" column="32" lean-forward="true" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="550">
+          <caret line="38" column="89" selection-start-line="38" selection-start-column="89" selection-end-line="38" selection-end-column="89" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="11" column="28" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1166">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="818">
+          <caret line="285" column="13" lean-forward="true" selection-start-line="285" selection-start-column="13" selection-end-line="285" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="129" column="31" lean-forward="true" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="323" column="72" lean-forward="true" selection-start-line="323" selection-start-column="72" selection-end-line="323" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="44" column="13" lean-forward="true" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-638">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="244">
+          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="157">
+          <caret line="16" column="55" lean-forward="true" selection-start-line="16" selection-start-column="55" selection-end-line="16" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="270" column="33" lean-forward="true" selection-start-line="270" selection-start-column="33" selection-end-line="270" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="490">
+          <caret line="141" selection-start-line="141" selection-end-line="141" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="164" column="5" lean-forward="true" selection-start-line="164" selection-start-column="5" selection-end-line="164" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/apiTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-242">
+          <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="61" column="16" lean-forward="true" selection-start-line="61" selection-start-column="16" selection-end-line="61" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="700">
+          <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="12" column="34" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="39" column="9" lean-forward="true" selection-start-line="39" selection-start-column="9" selection-end-line="39" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="32" column="29" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="29" />
           <folding>
-            <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-            <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#1838#1839#0" expanded="true" />
+            <element signature="e#1863#1864#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1925#1926#0" expanded="true" />
+            <element signature="e#1822#1823#0" expanded="true" />
+            <element signature="e#1851#1852#0" expanded="true" />
+            <element signature="e#1895#1896#0" expanded="true" />
+            <element signature="e#1931#1932#0" expanded="true" />
+            <element signature="e#2132#2133#0" expanded="true" />
+            <element signature="e#2164#2165#0" expanded="true" />
+            <element signature="e#2214#2215#0" expanded="true" />
+            <element signature="e#2256#2257#0" expanded="true" />
+            <element signature="e#2330#2331#0" expanded="true" />
+            <element signature="e#2370#2371#0" expanded="true" />
+            <element signature="e#2436#2437#0" expanded="true" />
+            <element signature="e#2494#2495#0" expanded="true" />
+            <element signature="e#2569#2570#0" expanded="true" />
+            <element signature="e#2602#2603#0" expanded="true" />
+            <element signature="e#2654#2655#0" expanded="true" />
+            <element signature="e#2698#2699#0" expanded="true" />
+            <element signature="e#2764#2765#0" expanded="true" />
+            <element signature="e#2795#2796#0" expanded="true" />
+            <element signature="e#2843#2844#0" expanded="true" />
+            <element signature="e#2883#2884#0" expanded="true" />
+            <element signature="e#2948#2949#0" expanded="true" />
+            <element signature="e#2980#2981#0" expanded="true" />
+            <element signature="e#3030#3031#0" expanded="true" />
+            <element signature="e#3072#3073#0" expanded="true" />
+            <element signature="e#3134#3135#0" expanded="true" />
+            <element signature="e#3162#3163#0" expanded="true" />
+            <element signature="e#3204#3205#0" expanded="true" />
+            <element signature="e#3238#3239#0" expanded="true" />
+            <element signature="e#3307#3308#0" expanded="true" />
+            <element signature="e#3346#3347#0" expanded="true" />
+            <element signature="e#3410#3411#0" expanded="true" />
+            <element signature="e#3466#3467#0" expanded="true" />
+            <element signature="e#3537#3538#0" expanded="true" />
+            <element signature="e#3567#3568#0" expanded="true" />
+            <element signature="e#3613#3614#0" expanded="true" />
+            <element signature="e#3651#3652#0" expanded="true" />
+            <element signature="e#3721#3722#0" expanded="true" />
+            <element signature="e#3759#3760#0" expanded="true" />
+            <element signature="e#3821#3822#0" expanded="true" />
+            <element signature="e#3875#3876#0" expanded="true" />
+            <element signature="e#3953#3954#0" expanded="true" />
+            <element signature="e#3991#3992#0" expanded="true" />
+            <element signature="e#4053#4054#0" expanded="true" />
+            <element signature="e#4107#4108#0" expanded="true" />
+            <element signature="e#4186#4187#0" expanded="true" />
+            <element signature="e#4225#4226#0" expanded="true" />
+            <element signature="e#4289#4290#0" expanded="true" />
+            <element signature="e#4345#4346#0" expanded="true" />
+            <element signature="e#4430#4431#0" expanded="true" />
+            <element signature="e#4474#4475#0" expanded="true" />
+            <element signature="e#4698#4699#0" expanded="true" />
+            <element signature="e#4740#4741#0" expanded="true" />
+            <element signature="e#4810#4811#0" expanded="true" />
+            <element signature="e#4872#4873#0" expanded="true" />
+            <element signature="e#4955#4956#0" expanded="true" />
+            <element signature="e#4994#4995#0" expanded="true" />
+            <element signature="e#5058#5059#0" expanded="true" />
+            <element signature="e#5114#5115#0" expanded="true" />
+            <element signature="e#5194#5195#0" expanded="true" />
+            <element signature="e#5233#5234#0" expanded="true" />
+            <element signature="e#5297#5298#0" expanded="true" />
+            <element signature="e#5353#5354#0" expanded="true" />
+            <element signature="e#5428#5429#0" expanded="true" />
+            <element signature="e#5462#5463#0" expanded="true" />
+            <element signature="e#5516#5517#0" expanded="true" />
+            <element signature="e#5562#5563#0" expanded="true" />
+            <element signature="e#5634#5635#0" expanded="true" />
+            <element signature="e#5670#5671#0" expanded="true" />
+            <element signature="e#5728#5729#0" expanded="true" />
+            <element signature="e#5778#5779#0" expanded="true" />
+            <element signature="e#5852#5853#0" expanded="true" />
+            <element signature="e#5888#5889#0" expanded="true" />
+            <element signature="e#5946#5947#0" expanded="true" />
+            <element signature="e#5996#5997#0" expanded="true" />
+            <element signature="e#6067#6068#0" expanded="true" />
+            <element signature="e#6100#6101#0" expanded="true" />
+            <element signature="e#6152#6153#0" expanded="true" />
+            <element signature="e#6196#6197#0" expanded="true" />
+            <element signature="e#6261#6262#0" expanded="true" />
+            <element signature="e#6291#6292#0" expanded="true" />
+            <element signature="e#6337#6338#0" expanded="true" />
+            <element signature="e#6375#6376#0" expanded="true" />
+            <element signature="e#6437#6438#0" expanded="true" />
+            <element signature="e#6467#6468#0" expanded="true" />
+            <element signature="e#6513#6514#0" expanded="true" />
+            <element signature="e#6551#6552#0" expanded="true" />
+            <element signature="e#6613#6614#0" expanded="true" />
+            <element signature="e#6643#6644#0" expanded="true" />
+            <element signature="e#6689#6690#0" expanded="true" />
+            <element signature="e#6727#6728#0" expanded="true" />
+            <element signature="e#6796#6797#0" expanded="true" />
+            <element signature="e#6829#6830#0" expanded="true" />
+            <element signature="e#6881#6882#0" expanded="true" />
+            <element signature="e#6925#6926#0" expanded="true" />
+            <element signature="e#6995#6996#0" expanded="true" />
+            <element signature="e#7030#7031#0" expanded="true" />
+            <element signature="e#7086#7087#0" expanded="true" />
+            <element signature="e#7134#7135#0" expanded="true" />
+            <element signature="e#7202#7203#0" expanded="true" />
+            <element signature="e#7233#7234#0" expanded="true" />
+            <element signature="e#7281#7282#0" expanded="true" />
+            <element signature="e#7321#7322#0" expanded="true" />
+            <element signature="e#7390#7391#0" expanded="true" />
+            <element signature="e#7426#7427#0" expanded="true" />
+            <element signature="e#7484#7485#0" expanded="true" />
+            <element signature="e#7534#7535#0" expanded="true" />
+            <element signature="e#7602#7603#0" expanded="true" />
+            <element signature="e#7636#7637#0" expanded="true" />
+            <element signature="e#7690#7691#0" expanded="true" />
+            <element signature="e#7736#7737#0" expanded="true" />
+            <element signature="e#7806#7807#0" expanded="true" />
+            <element signature="e#7840#7841#0" expanded="true" />
+            <element signature="e#7894#7895#0" expanded="true" />
+            <element signature="e#7940#7941#0" expanded="true" />
+            <element signature="e#8006#8007#0" expanded="true" />
+            <element signature="e#8036#8037#0" expanded="true" />
+            <element signature="e#8082#8083#0" expanded="true" />
+            <element signature="e#8120#8121#0" expanded="true" />
+            <element signature="e#8189#8190#0" expanded="true" />
+            <element signature="e#8226#8227#0" expanded="true" />
+            <element signature="e#8286#8287#0" expanded="true" />
+            <element signature="e#8338#8339#0" expanded="true" />
+            <element signature="e#8417#8418#0" expanded="true" />
+            <element signature="e#8457#8458#0" expanded="true" />
+            <element signature="e#8523#8524#0" expanded="true" />
+            <element signature="e#8581#8582#0" expanded="true" />
+            <element signature="e#8655#8656#0" expanded="true" />
+            <element signature="e#8687#8688#0" expanded="true" />
+            <element signature="e#8737#8738#0" expanded="true" />
+            <element signature="e#8779#8780#0" expanded="true" />
+            <element signature="e#8846#8847#0" expanded="true" />
+            <element signature="e#8879#8880#0" expanded="true" />
+            <element signature="e#8931#8932#0" expanded="true" />
+            <element signature="e#8975#8976#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#787#788#0" expanded="true" />
+            <element signature="e#817#818#0" expanded="true" />
+            <element signature="e#2105#2106#0" expanded="true" />
+            <element signature="e#2135#2136#0" expanded="true" />
+            <element signature="e#2431#2432#0" expanded="true" />
+            <element signature="e#2461#2462#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index 854f1f1..0db633a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -165,12 +165,16 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String startDay,String endDay) {
+    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew) {
         try {
 
             Criteria criteria = createCriteria(PgAlarm.class);
             criteria.addOrder(Order.desc("id"));
 
+            if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) {
+                criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
+            }
+
             if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay))
             {
                 criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay)));
@@ -193,9 +197,11 @@
 
                 criteria.add(Restrictions.le("alarmDate",date));
             }
+            if(StringUtils.isNotBlank(isNew)&&isNew.equals("true"))
+                criteria.add(Restrictions.eq("active", 1));
 
             List<PgAlarm> pgAlarmList = criteria.list();
-            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
     }
 
     //根据设备位置(仓位)获取摄像机列表
-    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+    public List<PgDeviceDto> getPgCameraListByPosition(String partition,String position){
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.like("position",position+"%"));
-//        criteria.add(Restrictions.eq("devType","球机"));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(position))
+            criteria.add(Restrictions.like("position",position+"%"));
+
         criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
 
         List<PgDevice> pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
             dto.setDevCode(objects[5].toString());
             dto.setDevType(objects[6].toString());
             if(objects[7]!=null)
-            dto.setIp(objects[7].toString());
+                dto.setIp(objects[7].toString());
             dto.setIsOpen(objects[8].toString());
             dto.setPartition(objects[11].toString());
             dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index 8ebf74d..3c657a7 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgEquipment;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
 import com.casic.PgInterface.devTable.dto.PgEquipmentDto;
@@ -34,9 +35,12 @@
     public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
-        criteria.add(Restrictions.eq("eqName",eqName));
-        criteria.add(Restrictions.eq("eqCode",eqCode));
-        criteria.add(Restrictions.eq("eqType",eqType));
+        if(StringUtils.isNotBlank(eqName))
+            criteria.add(Restrictions.eq("eqName",eqName));
+        if(StringUtils.isNotBlank(eqCode))
+            criteria.add(Restrictions.eq("eqCode",eqCode));
+        if(StringUtils.isNotBlank(eqType))
+            criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
@@ -51,10 +55,9 @@
 
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
-        //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
         String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
-        +eqType+"' group by equipment.EQ_NAME";
+                +eqType+"' group by equipment.EQ_NAME";
 
         List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4ed68e4..e413a5c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
@@ -39,7 +40,8 @@
 
     public List<PgPipeLineDto> getPipeLineByLineType(String lineType) {
         Criteria criteria = createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineType", lineType));
+        if(StringUtils.isNotBlank(lineType))
+            criteria.add(Restrictions.eq("lineType", lineType));
 
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    private Long id;
-    private String keyId;//巡检记录单id
-    private String planId;//巡检计划ID
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    @Column(name="KEY_ID")
-    public String getKeyId() {
-        return keyId;
-    }
-
-    public void setKeyId(String keyId) {
-        this.keyId = keyId;
-    }
-
-    @Column(name="PLAN_ID")
-    public String getPlanId() {
-        return planId;
-    }
-
-    public void setPlanId(String planId) {
-        this.planId = planId;
-    }
-
-    @Column(name="CREATE_DATE")
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    @Column(name="STATE")
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    @Column(name="CREATOR")
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    @Column(name="PLAN_NAME")
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    @Column(name="RECORD_NO")
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    @Column(name="PLAN_NO")
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    @Column(name="RESPONSIBIE_DEPT")
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    @Column(name="INSPECTION_PERSON")
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    @Column(name="PATROL_MAN")
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    @Column(name="OPERATE_DATE")
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    @Column(name="REMARK")
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Column(name="BUILD_CABIN")
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    @Column(name="PROJECT")
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    @Column(name="START_PILE_NO")
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    @Column(name="END_PILE_NO")
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    @Column(name="INSPECTION_PRACE")
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    @Column(name="OTHER_PATROL_MAN")
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private Long id;
+    private String KEY_ID;//唯一键值
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_PERSON;//巡检人
+    private String START_DATE;//巡检开始时间
+    private String END_DATE;
+    private String FREQUENCY;//巡检频率
+    private String STATE;//状态
+    private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+    private String PLAN_NO;//巡检计划编号
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_MODE;//巡检方式
+    private String INSPECTION_ROUTE;//巡检路线
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String INSPECTION_GROUP;//巡检部门
+    private String INSERT_TIME;//插入时间
+    private String FREQUENCYDATE;//巡检具体日期
+    private String FREQUENCYTIME;//巡检具体时间
+    private String CREATEDATE;//创建时间
+    private String CREATOR;//创建人
+    private String PROJECT;//项目
+    private String COMLILE;//编制人
+    private String START_TIME;//编制时间
+    private String DEVELOP_DEPT;//制定部门
+    private String END_TIME;//结束时间
+    private String START_PILE_NO;//开始桩号
+    private String END_PILE_NO;//结束桩号
+    private String BUILD_CABIN;//巡检舱室
+    private String MILEAGE;
+    private String FREQUENCY_TIME;//巡检具体时间
+    private String FREQUENCYTIME_END;
+    private String KETTLE_TS;
+    private String UPDATEDATE;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="KEY_ID")
+    public String getKEY_ID() {
+        return KEY_ID;
+    }
+
+    public void setKEY_ID(String KEY_ID) {
+        this.KEY_ID = KEY_ID;
+    }
+
+    @Column(name="PLAN_NAME")
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    @Column(name="INSPECTION_PERSON")
+    public String getINSPECTION_PERSON() {
+        return INSPECTION_PERSON;
+    }
+
+    public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+        this.INSPECTION_PERSON = INSPECTION_PERSON;
+    }
+
+    @Column(name="START_DATE")
+    public String getSTART_DATE() {
+        return START_DATE;
+    }
+
+    public void setSTART_DATE(String START_DATE) {
+        this.START_DATE = START_DATE;
+    }
+
+    @Column(name="END_DATE")
+    public String getEND_DATE() {
+        return END_DATE;
+    }
+
+    public void setEND_DATE(String END_DATE) {
+        this.END_DATE = END_DATE;
+    }
+
+    @Column(name="FREQUENCY")
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    @Column(name="STATE")
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    @Column(name="RESPONSIBLE_DEPT")
+    public String getRESPONSIBLE_DEPT() {
+        return RESPONSIBLE_DEPT;
+    }
+
+    public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+        this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+    }
+
+    @Column(name="PLAN_NO")
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    @Column(name="INSPECTION_TYPE")
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    @Column(name="INSPECTION_MODE")
+    public String getINSPECTION_MODE() {
+        return INSPECTION_MODE;
+    }
+
+    public void setINSPECTION_MODE(String INSPECTION_MODE) {
+        this.INSPECTION_MODE = INSPECTION_MODE;
+    }
+
+    @Column(name="INSPECTION_ROUTE")
+    public String getINSPECTION_ROUTE() {
+        return INSPECTION_ROUTE;
+    }
+
+    public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+        this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+    }
+
+    @Column(name="INSPECTION_START_TIME")
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    @Column(name="INSPECTION_END_TIME")
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    @Column(name="INSPECTION_PRACE")
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    @Column(name="INSPECTION_GROUP")
+    public String getINSPECTION_GROUP() {
+        return INSPECTION_GROUP;
+    }
+
+    public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+        this.INSPECTION_GROUP = INSPECTION_GROUP;
+    }
+
+    @Column(name="INSERT_TIME")
+    public String getINSERT_TIME() {
+        return INSERT_TIME;
+    }
+
+    public void setINSERT_TIME(String INSERT_TIME) {
+        this.INSERT_TIME = INSERT_TIME;
+    }
+
+    @Column(name="FREQUENCYDATE")
+    public String getFREQUENCYDATE() {
+        return FREQUENCYDATE;
+    }
+
+    public void setFREQUENCYDATE(String FREQUENCYDATE) {
+        this.FREQUENCYDATE = FREQUENCYDATE;
+    }
+
+    @Column(name="FREQUENCYTIME")
+    public String getFREQUENCYTIME() {
+        return FREQUENCYTIME;
+    }
+
+    public void setFREQUENCYTIME(String FREQUENCYTIME) {
+        this.FREQUENCYTIME = FREQUENCYTIME;
+    }
+
+    @Column(name="CREATEDATE")
+    public String getCREATEDATE() {
+        return CREATEDATE;
+    }
+
+    public void setCREATEDATE(String CREATEDATE) {
+        this.CREATEDATE = CREATEDATE;
+    }
+
+    @Column(name="CREATOR")
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    @Column(name="PROJECT")
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    @Column(name="COMLILE")
+    public String getCOMLILE() {
+        return COMLILE;
+    }
+
+    public void setCOMLILE(String COMLILE) {
+        this.COMLILE = COMLILE;
+    }
+
+    @Column(name="START_TIME")
+    public String getSTART_TIME() {
+        return START_TIME;
+    }
+
+    public void setSTART_TIME(String START_TIME) {
+        this.START_TIME = START_TIME;
+    }
+
+    @Column(name="DEVELOP_DEPT")
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    @Column(name="END_TIME")
+    public String getEND_TIME() {
+        return END_TIME;
+    }
+
+    public void setEND_TIME(String END_TIME) {
+        this.END_TIME = END_TIME;
+    }
+
+    @Column(name="START_PILE_NO")
+    public String getSTART_PILE_NO() {
+        return START_PILE_NO;
+    }
+
+    public void setSTART_PILE_NO(String START_PILE_NO) {
+        this.START_PILE_NO = START_PILE_NO;
+    }
+
+    @Column(name="END_PILE_NO")
+    public String getEND_PILE_NO() {
+        return END_PILE_NO;
+    }
+
+    public void setEND_PILE_NO(String END_PILE_NO) {
+        this.END_PILE_NO = END_PILE_NO;
+    }
+
+    @Column(name="BUILD_CABIN")
+    public String getBUILD_CABIN() {
+        return BUILD_CABIN;
+    }
+
+    public void setBUILD_CABIN(String BUILD_CABIN) {
+        this.BUILD_CABIN = BUILD_CABIN;
+    }
+
+    @Column(name="MILEAGE")
+    public String getMILEAGE() {
+        return MILEAGE;
+    }
+
+    public void setMILEAGE(String MILEAGE) {
+        this.MILEAGE = MILEAGE;
+    }
+
+    @Column(name="FREQUENCY_TIME")
+    public String getFREQUENCY_TIME() {
+        return FREQUENCY_TIME;
+    }
+
+    public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+        this.FREQUENCY_TIME = FREQUENCY_TIME;
+    }
+
+    @Column(name="FREQUENCYTIME_END")
+    public String getFREQUENCYTIME_END() {
+        return FREQUENCYTIME_END;
+    }
+
+    public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+        this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+    }
+
+    @Column(name="KETTLE_TS")
+    public String getKETTLE_TS() {
+        return KETTLE_TS;
+    }
+
+    public void setKETTLE_TS(String KETTLE_TS) {
+        this.KETTLE_TS = KETTLE_TS;
+    }
+
+    @Column(name="UPDATEDATE")
+    public String getUPDATEDATE() {
+        return UPDATEDATE;
+    }
+
+    public void setUPDATEDATE(String UPDATEDATE) {
+        this.UPDATEDATE = UPDATEDATE;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 5346b57..2f8d359 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -66,7 +66,7 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REPAIRMAN")
+    @Column(name="REOAIRMAN")
     public String getRepairMan() {
         return repairMan;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
-    private Long id;
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-
-
-    public static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
-        PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
-        pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
-        pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
-        pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
-        pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
-        pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
-        pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
-        pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
-        pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
-        pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
-        pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
-        pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
-        pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
-        pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
-        pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
-        return pgAssetInSpectionRecordDto;
-    }
-
-
-    public static List<PgAssetInSpectionRecordDto> ConvertToDtoList(List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList){
-        List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-        for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
-            pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
-        }
-
-        return pgAssetInSpectionRecordDtoList;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
-    private String num;
-    private String createDate;
-
-    public String getNum() {
-        return num;
-    }
-
-    public void setNum(String num) {
-        this.num = num;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+    private Long id;
+    private String PLAN_NO;//巡检计划编号
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String FREQUENCY;//巡检频率
+    private String CREATOR;//创建人
+    private String DEVELOP_DEPT;//制定部门
+    private String PROJECT;//项目
+    private String STATE;//状态
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+        PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+        pgAssetPlanDto.setId(pgAssetPlan.getId());
+        pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+        pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+        pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+        pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+        pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+        pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+        pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+        pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+        pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+        pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+        pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+        return pgAssetPlanDto;
+    }
+
+    public static List<PgAssetPlanDto> ConvertToPgAssetDtoList(List<PgAssetPlan> pgAssetPlanList){
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
+
+        for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+            pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+        }
+
+        return pgAssetPlanDtoList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
new file mode 100644
index 0000000..bc12db1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
@@ -0,0 +1,24 @@
+package com.casic.PgInterface.maintenance.dto;
+
+public class PgAssetPlanStatic {
+
+    private String num;
+    private String createDate;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
deleted file mode 100644
index c41ca7d..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.casic.PgInterface.maintenance.manager;
-
-import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
-
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
-        try {
-            String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
-                    "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
-                    "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-
-            if(patrolMan!=null)
-                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
-            if(startTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
-            if(endTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')<to_date('"+endTime+"','yyyy-MM-dd')";
-
-            sql+=" order by id";
-
-            List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
-
-            List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList=new ArrayList<>();
-            for(Object[] objects1:objects){
-                PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord();
-
-                pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString()));
-                pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1]));
-                pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2]));
-                pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3]));
-                pgAssetInSpectionRecord.setState(String.valueOf(objects1[4]));
-                pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5]));
-                pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6]));
-                pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7]));
-                pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8]));
-                pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9]));
-                pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10]));
-                pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11]));
-                pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12]));
-                pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13]));
-                pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14]));
-                pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15]));
-                pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16]));
-                pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17]));
-                pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18]));
-                pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19]));
-
-                pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord);
-            }
-
-            List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-            for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList)
-            {
-                pgAssetInSpectionRecordDtoList.add(PgAssetInSpectionRecordDto.ConvertToDto(pgAssetInSpectionRecord));
-            }
-
-            return pgAssetInSpectionRecordDtoList;
-        }
-        catch(Exception e)
-        {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public List<PgAssetInSpectionRecordStatic> getPgAssetInSpectionRecordStaticLisByTime(
-            String startTime, String endTime, String staticType) {
-
-        String sql="";
-        String dateType="";
-        List<PgAssetInSpectionRecordStatic> pgAssetInSpectionRecordStaticList=new ArrayList<>();
-        int type=Integer.valueOf(staticType);
-
-        switch(type) {
-            case 0://年
-                dateType = "yyyy";
-                break;
-            case 1://月
-                dateType = "yyyy-mm";
-                break;
-            case 2://周
-                dateType = "iw";
-                break;
-            case 3://日
-                dateType="yyyy-mm-dd";
-                break;
-            default:
-                break;
-        }
-
-        sql="select count(*), to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_RECORD t where 1=1";
-
-        if(startTime!=null)
-            sql+=" and t.CREATE_DATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
-        if(endTime!=null)
-            sql+=" and t.CREATE_DATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
-
-        sql+=" group by to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"')";
-
-        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
-        for(int i=0;i<objects.size();i++)
-        {
-            PgAssetInSpectionRecordStatic pgAssetInSpectionRecordStatic=new PgAssetInSpectionRecordStatic();
-            pgAssetInSpectionRecordStatic.setNum(objects.get(i)[0].toString());
-            pgAssetInSpectionRecordStatic.setCreateDate(objects.get(i)[1].toString());
-            pgAssetInSpectionRecordStaticList.add(pgAssetInSpectionRecordStatic);
-        }
-        return pgAssetInSpectionRecordStaticList;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
new file mode 100644
index 0000000..bb6bf1e
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
@@ -0,0 +1,81 @@
+package com.casic.PgInterface.maintenance.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgAssetPlanManager extends HibernateEntityDao<PgAssetPlan> {
+
+    public List<PgAssetPlanDto> getPgAssetPlanDtoList(String inSpectionPlace){
+        Criteria criteria=createCriteria(PgAssetPlan.class);
+
+        if(StringUtils.isNotBlank(inSpectionPlace))
+            criteria.add(Restrictions.like("INSPECTION_PRACE","%"+inSpectionPlace+"%"));
+        criteria.addOrder(Order.desc("id"));
+
+        List<PgAssetPlan> pgAssetPlanList=criteria.list();
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=PgAssetPlanDto.ConvertToPgAssetDtoList(pgAssetPlanList);
+
+        if(pgAssetPlanDtoList==null||pgAssetPlanDtoList.size()==0)
+            return null;
+        else
+            return pgAssetPlanDtoList;
+    }
+
+    public List<PgAssetPlanStatic> getPgAssetPlanStaticLisByTime(
+            String startTime, String endTime, String staticType) {
+
+        String sql="";
+        String dateType="";
+        List<PgAssetPlanStatic> pgAssetPlanStaticList=new ArrayList<>();
+        int type=Integer.valueOf(staticType);
+
+        switch(type) {
+            case 0://年
+                dateType = "yyyy";
+                break;
+            case 1://月
+                dateType = "yyyy-mm";
+                break;
+            case 2://周
+                dateType = "iw";
+                break;
+            case 3://日
+                dateType="yyyy-mm-dd";
+                break;
+            default:
+                break;
+        }
+
+        sql="select count(*), to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_PLAN t where 1=1";
+
+        if(startTime!=null)
+            sql+=" and t.CREATEDATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
+        if(endTime!=null)
+            sql+=" and t.CREATEDATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
+
+        sql+=" group by to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"')";
+
+        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
+        for(int i=0;i<objects.size();i++)
+        {
+            PgAssetPlanStatic pgAssetPlanStatic=new PgAssetPlanStatic();
+            pgAssetPlanStatic.setNum(objects.get(i)[0].toString());
+            pgAssetPlanStatic.setCreateDate(objects.get(i)[1].toString());
+            pgAssetPlanStaticList.add(pgAssetPlanStatic);
+        }
+        return pgAssetPlanStaticList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 0903f22..3484739 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -15,7 +15,7 @@
 
     public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
             if(repairMan!=null)
                 sql+=" and REPAIRMAN like '%"+repairMan+"%'";
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index 9cc2881..6d90d7b 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -1,5 +1,7 @@
 package com.casic.PgInterface.patroler.dto;
 
+import com.casic.PgInterface.devTable.domain.PgDevice;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 
 /**
@@ -14,6 +16,7 @@
     private String unit;//单位
     private String alarmType;//报警类型
     private Long pgDeviceId;//设备编号
+    private String assetCode;//资产编号
 
     public Long getId() {
         return id;
@@ -71,7 +74,15 @@
         this.pgDeviceId = pgDeviceId;
     }
 
-    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
+    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule, PgDeviceManager pgDeviceManager) {
         this.setId(pgAlarmRule.getId());
         this.setHighValue(pgAlarmRule.getHighValue());
         this.setLowValue(pgAlarmRule.getLowValue());
@@ -82,6 +93,10 @@
         else
             this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
         this.setPgDeviceId(pgAlarmRule.getPgDeviceId());
+        if(pgAlarmRule.getAlarmTypeId()!=null&&pgDeviceManager.get(pgAlarmRule.getPgDeviceId())!=null)
+            this.setAssetCode(pgDeviceManager.get(pgAlarmRule.getPgDeviceId()).getAssetCode());
+        else
+            this.setAssetCode("");
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
index c132c98..a7cef5b 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
@@ -1,13 +1,17 @@
 package com.casic.PgInterface.patroler.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.ResponseStatus;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -17,30 +21,23 @@
 @Service
 public class PgAlarmRuleManager extends HibernateEntityDao<PgAlarmRule> {
 
+    @Resource
+    private PgDeviceManager pgDeviceManager;
+
     //根据设备获取设备报警阈值
-    public List<PgAlarmRuleDto>  getAlarmRuleDto() {
+    public List<PgAlarmRuleDto>  getAlarmRuleDto(String devType) {
         Criteria criteria=createCriteria(PgAlarmRule.class);
+
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.eq("devType", devType));
         criteria.addOrder(Order.desc("id"));
 
         List<PgAlarmRule> pgAlarmRuleList=criteria.list();
-        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
+        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         for (PgAlarmRule pgAlarmRule : pgAlarmRuleList) {
-            pgAlarmRuleDtoList.add(new PgAlarmRuleDto(pgAlarmRule));
+            pgAlarmRuleDtoList.add(new PgAlarmRuleDto(pgAlarmRule,pgDeviceManager));
         }
         return pgAlarmRuleDtoList;
-
     }
 
-    public PgAlarmRule getAlarmRuleBydevType(String devType) {
-        Criteria criteria=createCriteria(PgAlarmRule.class);
-        criteria.add(Restrictions.eq("devType", devType));
-
-        List<PgAlarmRule> pgAlarmRuleList=criteria.list();
-
-        if(pgAlarmRuleList==null||pgAlarmRuleList.size()==0)
-            return null;
-        else
-            return pgAlarmRuleList.get(0);
-    }
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index d0e28f5..082ba5d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgAlarm;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
@@ -39,7 +40,7 @@
     private PgReservePlanManager pgReservePlanManager;
 
     /*
-    * 获取报警设备信息
+     * 获取报警设备信息
      */
     @POST
     @Path("linkDevice")
@@ -50,11 +51,22 @@
 
         PgDeviceDto pgDeviceDto = null;
         try {
-            PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
-            PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
-
-            pgDeviceDto=new PgDeviceDto(pgDevice);
-            msg = "报警关联设备获取成功";
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if (pgAlarm == null)
+                    msg = "不存在报警信息";
+                else {
+                    PgDevice pgDevice = pgAlarm.getAlarmDevId();
+                    if (pgDevice == null)
+                        msg = "不存在报警设备";
+                    else {
+                        pgDeviceDto = new PgDeviceDto(pgDevice);
+                        msg = "报警关联设备获取成功";
+                    }
+                }
+            }
+            else
+                msg="未接受到报警设备ID信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取关联设备失败";
@@ -77,11 +89,28 @@
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
-            PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
-            PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
-            pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if(pgAlarm==null)
+                    msg="不存在报警信息";
+                else {
+                    PgDevice pgDevice = pgAlarm.getAlarmDevId();
+                    if (pgDevice == null)
+                        msg = "不存在报警设备";
+                    else {
+                        String strPosition=pgDevice.getPosition();
+                        String position="";
+                        if(!strPosition.equals(""))
+                            position=pgDevice.getPosition().substring(0,3);
+                        String partition=pgDevice.getPartition();
 
-            msg = "关联设备获取成功";
+                        pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
+                        msg = "关联设备获取成功";
+                    }
+                }
+            }
+            else
+                msg="请输入报警设备Id信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "分区设备关联失败";
@@ -93,7 +122,7 @@
 
     /*
      * 根据报警记录获取关联的预案
-    */
+     */
     @POST
     @Path("linkReservePlan")
     @Produces(MediaType.APPLICATION_JSON)
@@ -103,10 +132,21 @@
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
-            PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
-            pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if (pgAlarm == null)
+                    msg = "不存在报警信息";
+                else {
+                    pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-            msg="关联预案获取成功";
+                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
+                        msg="不存在关联的报警预案";
+                    else
+                        msg = "关联预案获取成功";
+                }
+            }
+            else
+                msg="请输入报警信息";
         }
         catch(Exception e)
         {
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index d18ebb8..baacd93 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -48,14 +48,16 @@
     @POST
     @Path("getAlarmInfo")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmList(@FormParam("startDay") String startDay,
-                                            @FormParam("endDay") String endDay) throws Exception {
+    public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
+                                            @FormParam("startDay") String startDay,
+                                            @FormParam("endDay") String endDay,
+                                            @FormParam("isNew") String isNew) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(startDay,endDay);
-            if (pgAlarmDtoList.size() == 0)
+            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew);
+            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
                 msg = "没有报警信息";
             else
                 msg = "报警信息获取成功";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 87afd54..29ce8a4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -1,7 +1,5 @@
 package com.casic.PgInterface.rs;
 
-import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager;
-import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import com.casic.PgInterface.patroler.manager.PgAlarmRuleManager;
@@ -30,119 +28,23 @@
     private static Logger logger = LoggerFactory.getLogger(PgAlarmRule.class);
 
     @Resource
-    private PgDeviceManager pgDeviceManager;
-    @Resource
-    private PgAlarmTypeManager pgAlarmTypeManager;
-    @Resource
     private PgAlarmRuleManager pgAlarmRuleManager;
 
-
-
-    /**
-     * 新增报警阈值
-     */
-    @POST
-    @Path("addAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> addAlarmRule(@FormParam("highValue") String highValue,
-                                            @FormParam("lowValue") String lowValue,
-                                            @FormParam("unit") String unit,
-                                            @FormParam("devType") String devType,
-                                            @FormParam("alarmType") String alarmType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType);
-            if (pgAlarmRule != null) {
-                result = "false";
-                msg = "设备阈值已经存在";
-            } else {
-                pgAlarmRule = new PgAlarmRule();
-                pgAlarmRule.setHighValue(highValue);
-                pgAlarmRule.setLowValue(lowValue);
-                pgAlarmRule.setDevType(devType);
-                pgAlarmRule.setUnit(unit);
-                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
-
-                pgAlarmRuleManager.save(pgAlarmRule);
-                result = "true";
-                msg = "报警阈值新增成功";
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = "false";
-            msg = "报警阈值新增失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-        return resultMap;
-    }
-
-    /**
-     * 编辑报警阈值
-     */
-    @POST
-    @Path("editAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> editAlarmRule(@FormParam("id") String id,
-                                             @FormParam("devType") String devType,
-                                             @FormParam("highValue") String highValue,
-                                             @FormParam("lowValue") String lowValue,
-                                             @FormParam("unit") String unit,
-                                             @FormParam("alarmType") String alarmType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
-            if (pgAlarmRule == null) {
-                msg = "不存在报警阈值记录";
-                result = "false";
-            } else {
-                pgAlarmRule.setDevType(devType);
-                pgAlarmRule.setHighValue(highValue);
-                pgAlarmRule.setLowValue(lowValue);
-                pgAlarmRule.setUnit(unit);
-                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
-
-                pgAlarmRuleManager.save(pgAlarmRule);
-                msg = "编辑成功";
-                result = "true";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            result = "false";
-            msg = "报警阈值编辑失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-
-        return resultMap;
-    }
-
     /**
      * 获取报警阈值信息
      */
     @POST
     @Path("getAlarmRule")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmRule() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+    public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
+        System.out.println("devType:"+devType);
+        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
-            pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto();
-            if (pgAlarmRuleDtoList == null)
+            pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
+            if (pgAlarmRuleDtoList == null||pgAlarmRuleDtoList.size()==0)
                 msg = "不存在报警阈值信息";
             else
                 msg = "报警阈值获取成功";
@@ -155,69 +57,4 @@
         return resultMap;
     }
 
-    /**
-     * 删除报警阈值
-     */
-    @POST
-    @Path("deleteAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> deleteAlarmRule(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
-            if (pgAlarmRule == null) {
-                msg = "不存在报警阈值记录";
-                result = "false";
-            } else {
-                pgAlarmRuleManager.remove(pgAlarmRule);
-                msg = "删除成功";
-                result = "true";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            result = "false";
-            msg = "报警阈值删除失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-
-        return resultMap;
-    }
-
-    /**
-     * 根据设备类型报警阈值
-     */
-    @POST
-    @Path("getAlarmRuleByDevType")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmRuleByDevType(@FormParam("devType") String devType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        PgAlarmRule pgAlarmRule = null;
-        List<PgAlarmRuleDto> pgAlarmRuleDtos = new ArrayList<>();
-        try {
-            pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType);
-            if (pgAlarmRule == null)
-                msg = "不存在报警阈值记录";
-            else {
-                PgAlarmRuleDto pgAlarmRuleDto= new PgAlarmRuleDto(pgAlarmRule);
-                pgAlarmRuleDtos.add(pgAlarmRuleDto);
-                msg = "报警阈值获取成功";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            msg = "报警阈值获取失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmRuleDtos);
-
-        return resultMap;
-    }
-
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
new file mode 100644
index 0000000..19d3b8c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanRs")
+public class PgAssetPlanRs {
+
+    @Resource
+    private PgAssetPlanManager pgAssetPlanManager;
+
+    /**
+     * 获取巡检记录
+     */
+    @POST
+    @Path("getPgAssetPlanList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPgAssetPlanList(@FormParam("inSpectionPlace") String inSpectionPlace){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
+        try{
+            pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(inSpectionPlace);
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
+                msg="巡检信息获取成功";
+            else
+                msg="不存在巡检信息";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="巡检信息获取失败";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAssetPlanDtoList);
+
+        return resultMap;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
new file mode 100644
index 0000000..47ef9d1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanStaticRs")
+public class PgAssetPlanStaticRs {
+
+    @Resource
+    private PgAssetPlanManager pgAssetPlanManager;
+
+    @POST
+    @Path("getPgAssetPlanStaticList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPgAssetPlanStaticList(@FormParam("startTime") String startTime,
+                                                       @FormParam("endTime") String endTime,
+                                                       @FormParam("staticType") String staticType) throws Exception{
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
+        try{
+            pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
+                msg="巡检统计信息获取成功";
+            else
+                msg="统计信息获取失败";
+        }
+        catch (Exception ex){
+            ex.printStackTrace();
+            msg="统计失败";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAssetPlanStaticList);
+
+        return resultMap;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
deleted file mode 100644
index 66f4d09..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.manager.PgAssetInSpectionRecordManager;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@Path("pgAssetRecordRs")
-public class PgAssetRecordRs {
-
-    @Resource
-    private PgAssetInSpectionRecordManager pgAssetInSpectionRecordManager;
-
-    /**
-     * 获取巡检记录
-     */
-    @POST
-    @Path("getPgAssetRecordList")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgAssetRecordList(@FormParam("patrolMan") String patrolMan,
-                                                   @FormParam("startTime") String startTime,
-                                                   @FormParam("endTime") String endTime){
-        Map<String,Object> resultMap=new HashMap<>();
-        String msg="";
-
-        List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-        try{
-            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(patrolMan,startTime,endTime);
-            if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0)
-                msg="巡检信息获取成功";
-            else
-                msg="不存在巡检信息";
-        }
-        catch(Exception ex){
-            ex.printStackTrace();
-            msg="巡检信息获取失败";
-        }
-
-        resultMap.put("msg",msg);
-        resultMap.put("result",pgAssetInSpectionRecordDtoList);
-
-        return resultMap;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java
deleted file mode 100644
index 5f0417a..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import com.casic.PgInterface.maintenance.manager.PgAssetInSpectionRecordManager;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@Path("pgAssetRecordStaticRs")
-public class PgAssetRecordStaticRs {
-
-    @Resource
-    private PgAssetInSpectionRecordManager pgAssetInSpectionRecordManager;
-
-    @POST
-    @Path("getPgAssetRecordHeadStaticList")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgAssetRecordHeadStaticList(@FormParam("startTime") String startTime,
-                                                                @FormParam("endTime") String endTime,
-                                                                @FormParam("staticType") String staticType) throws Exception{
-        Map<String,Object> resultMap=new HashMap<>();
-        String msg="";
-        String result="";
-
-        List<PgAssetInSpectionRecordStatic> pgAssetInSpectionRecordStaticList = null;
-        try{
-            pgAssetInSpectionRecordStaticList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetInSpectionRecordStaticList!=null&&pgAssetInSpectionRecordStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
-            else
-                msg="统计信息获取失败";
-        }
-        catch (Exception ex){
-            ex.printStackTrace();
-            msg="统计失败";
-        }
-
-        resultMap.put("msg",msg);
-        resultMap.put("result",pgAssetInSpectionRecordStaticList);
-
-        return resultMap;
-    }
-
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index 9dfdd88..a0245ba 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -326,7 +326,7 @@
 
             PgConstruction pgConstruction=pgConstructionManager.get(Long.valueOf(id));
 
-            pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(pgConstruction.getPgName());
+            pgDeviceDtoList=pgDeviceManager.getPgCameraListByPartition(pgConstruction.getPgName());
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index 1c8130c..c276fb3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -177,6 +177,7 @@
             else
             {
                 pgEquipment.setActive(0);
+                pgEquipmentManager.save(pgEquipment);
                 msg="删除成功";
                 result="true";
             }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index 486b49f..f0b936c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -287,7 +287,7 @@
         try {
             if (apCode != "") {
                 String apCodeStr=apCode.substring(0,3);
-                pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(apCodeStr);
+                pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition("",apCodeStr);
                 if(pgDeviceDtoList==null)
                     msg="不存在关联摄像机";
                 else
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 982e3d9..a6da81e 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -11,15 +11,13 @@
 
 
 # ============================================================================
-# dbd
+# db
 # ============================================================================
 db.default.driverClassName=oracle.jdbc.driver.OracleDriver
-db.default.url=jdbc:oracle:thin:@172.17.0.201:1521:szgl
-#db.default.url=jdbc:oracle:thin:@119.254.103.80:1521:chengdu
-db.default.username=scott
-db.default.password=scott
-#db.default.username=PG
-#db.default.password=PG
+#db.default.url=jdbc:oracle:thin:@172.17.0.201:1521:szgl
+db.default.url=jdbc:oracle:thin:@119.254.103.80:1521:chengdu
+db.default.username=PG
+db.default.password=PG
 
 
 # ============================================================================
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190828.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190828.docx"
new file mode 100644
index 0000000..7920004
--- /dev/null
+++ "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190828.docx"
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190828.docx" "b/~$\350\257\264\346\230\21620190828.docx"
new file mode 100644
index 0000000..575ddd4
--- /dev/null
+++ "b/~$\350\257\264\346\230\21620190828.docx"
Binary files differ
diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\21620190726.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\21620190726.docx"
deleted file mode 100644
index d320e29..0000000
--- "a/\346\216\245\345\217\243\350\257\264\346\230\21620190726.docx"
+++ /dev/null
Binary files differ
diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\21620190910.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\21620190910.docx"
new file mode 100644
index 0000000..0650e1e
--- /dev/null
+++ "b/\346\216\245\345\217\243\350\257\264\346\230\21620190910.docx"
Binary files differ

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ff69e2a..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,27 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190828.docx" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -32,72 +42,119 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="2" />
-          <entry key="java" value="243" />
-          <entry key="properties" value="6" />
+          <entry key="java" value="321" />
+          <entry key="properties" value="8" />
           <entry key="xml" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
-          <entry key="JAVA" value="243" />
-          <entry key="Properties" value="6" />
+          <entry key="JAVA" value="321" />
+          <entry key="Properties" value="8" />
           <entry key="XML" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="8082" />
-          <entry key="properties" value="49" />
-          <entry key="txt" value="64" />
+          <entry key="dummy" value="16" />
+          <entry key="java" value="10723" />
+          <entry key="properties" value="59" />
+          <entry key="txt" value="118" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="8082" />
-          <entry key="PLAIN_TEXT" value="64" />
-          <entry key="Properties" value="49" />
+          <entry key="JAVA" value="10723" />
+          <entry key="PLAIN_TEXT" value="134" />
+          <entry key="Properties" value="59" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="4" />
+          <entry key="project.closed" value="28" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
           <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.24" value="1" />
+          <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="1" />
-          <entry key="project.open.time.3" value="3" />
-          <entry key="project.open.time.31" value="1" />
+          <entry key="project.open.time.28" value="1" />
+          <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.31" value="2" />
           <entry key="project.open.time.37" value="1" />
+          <entry key="project.open.time.39" value="2" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.40" value="1" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="1" />
+          <entry key="project.open.time.44" value="2" />
           <entry key="project.open.time.45" value="2" />
           <entry key="project.open.time.48" value="1" />
           <entry key="project.open.time.49" value="1" />
+          <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.58" value="1" />
           <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.71" value="1" />
+          <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.71" value="2" />
           <entry key="project.open.time.76" value="1" />
-          <entry key="project.opened" value="25" />
+          <entry key="project.opened" value="41" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+            <state relative-caret-position="174">
+              <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
               <folding>
-                <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-                <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="352">
+              <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#787#788#0" expanded="true" />
+                <element signature="e#817#818#0" expanded="true" />
+                <element signature="e#2105#2106#0" expanded="true" />
+                <element signature="e#2135#2136#0" expanded="true" />
+                <element signature="e#2431#2432#0" expanded="true" />
+                <element signature="e#2461#2462#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="638">
+              <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+              <folding>
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -122,6 +179,7 @@
       <find>getPgDeviceByDevType</find>
       <find>message</find>
       <find>getConstructionByType</find>
+      <find>getPgCameraListByPosition</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -130,24 +188,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanTypeDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
@@ -162,17 +207,38 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
       </list>
     </option>
   </component>
@@ -208,16 +274,18 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="3" />
-    <option name="y" value="10" />
-    <option name="width" value="1386" />
-    <option name="height" value="788" />
+    <option name="x" value="1410" />
+    <option name="y" value="117" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -258,7 +326,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -267,16 +335,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -286,7 +345,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="dto" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -296,7 +355,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="manager" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -308,19 +367,10 @@
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="webapp" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -359,6 +409,7 @@
       </deployment>
       <server-settings>
         <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_7" />
+        <option name="JNDI_PORT" value="10991" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -456,7 +507,23 @@
       <workItem from="1566350810712" duration="6803000" />
       <workItem from="1566435787074" duration="10717000" />
       <workItem from="1566521753529" duration="14265000" />
-      <workItem from="1566614176989" duration="5693000" />
+      <workItem from="1566614176989" duration="14059000" />
+      <workItem from="1566780822009" duration="1026000" />
+      <workItem from="1566891563975" duration="284000" />
+      <workItem from="1566893107340" duration="3382000" />
+      <workItem from="1566953794976" duration="11039000" />
+      <workItem from="1567059357700" duration="484000" />
+      <workItem from="1567082835097" duration="1086000" />
+      <workItem from="1567126428020" duration="1539000" />
+      <workItem from="1567129277820" duration="5788000" />
+      <workItem from="1567136008996" duration="2568000" />
+      <workItem from="1567237040302" duration="111000" />
+      <workItem from="1567495626345" duration="2797000" />
+      <workItem from="1567558770152" duration="2352000" />
+      <workItem from="1567577368149" duration="640000" />
+      <workItem from="1567751224608" duration="780000" />
+      <workItem from="1568019299799" duration="695000" />
+      <workItem from="1568082566133" duration="4016000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -493,17 +560,60 @@
       <option name="project" value="LOCAL" />
       <updated>1566553388171</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="整理管线部分">
+      <created>1566620046627</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1566620046627</updated>
+    </task>
+    <task id="LOCAL-00007" summary="合并代码提交">
+      <created>1566781001910</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1566781001910</updated>
+    </task>
+    <task id="LOCAL-00008" summary="合并代码提交">
+      <created>1566963831930</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1566963831930</updated>
+    </task>
+    <task id="LOCAL-00009" summary="修改报警阈值">
+      <created>1566972146710</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1566972146710</updated>
+    </task>
+    <task id="LOCAL-00010" summary="修改巡检维护表字段">
+      <created>1567126525554</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1567126525554</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="142930000" />
+    <option name="totallyTimeSpent" value="189883000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
+    <frame x="1358" y="-8" width="1456" height="916" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29297996" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -511,13 +621,14 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Thumbnails" weight="0.3295082" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.5081967" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.3849105" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
       <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
       <window_info anchor="bottom" id="Spring" order="8" />
       <window_info anchor="bottom" id="Terminal" order="9" />
@@ -539,7 +650,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2193646" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -547,22 +658,23 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.47540984" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
-      <window_info anchor="bottom" id="Spring" order="8" />
-      <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
-      <window_info anchor="bottom" id="Statistic" order="11" />
-      <window_info anchor="bottom" id="Java Enterprise" order="12" />
-      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="14" weight="0.32786885" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.52307695" />
+      <window_info anchor="bottom" id="Thumbnails" order="0" weight="0.3295082" />
+      <window_info anchor="bottom" id="Message" order="1" />
+      <window_info anchor="bottom" id="Find" order="2" />
+      <window_info anchor="bottom" id="Run" order="3" />
+      <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.49924356" weight="0.49344262" />
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Application Servers" order="8" weight="0.3276923" />
+      <window_info anchor="bottom" id="Spring" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
+      <window_info anchor="bottom" id="Statistic" order="12" />
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <window_info anchor="bottom" id="Database Changes" order="14" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="15" weight="0.32786885" />
+      <window_info anchor="bottom" id="Messages" order="16" weight="0.5229508" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -578,6 +690,16 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -587,7 +709,11 @@
     <MESSAGE value="修改权限问题" />
     <MESSAGE value="修改人员登录返回接口" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整理管线部分" />
+    <MESSAGE value="合并代码提交" />
+    <MESSAGE value="修改报警阈值" />
+    <MESSAGE value="修改巡检维护表字段" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护表字段" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -602,322 +728,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-532">
-          <caret line="50" column="28" lean-forward="true" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="19" column="60" selection-start-line="19" selection-start-column="60" selection-end-line="19" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="100" column="34" lean-forward="true" selection-start-line="100" selection-start-column="34" selection-end-line="100" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1474">
-          <caret line="84" column="58" selection-start-line="84" selection-start-column="58" selection-end-line="84" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1100">
-          <caret line="58" column="18" selection-start-line="58" selection-start-column="18" selection-end-line="58" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6842">
-          <caret line="329" selection-start-line="329" selection-end-line="329" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="102" column="24" lean-forward="true" selection-start-line="102" selection-start-column="24" selection-end-line="102" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="72" column="56" lean-forward="true" selection-start-line="72" selection-start-column="56" selection-end-line="72" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="90" column="39" lean-forward="true" selection-start-line="90" selection-start-column="39" selection-end-line="90" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="97" column="16" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
-          <caret line="14" column="52" lean-forward="true" selection-start-line="14" selection-start-column="52" selection-end-line="14" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="26" column="34" lean-forward="true" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="61" column="1" lean-forward="true" selection-start-line="61" selection-start-column="1" selection-end-line="61" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="208" column="49" lean-forward="true" selection-start-line="208" selection-start-column="49" selection-end-line="208" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="140" column="57" selection-start-line="140" selection-start-column="57" selection-end-line="140" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="111" column="36" selection-start-line="111" selection-start-column="36" selection-end-line="111" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="3" lean-forward="true" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="81" column="58" lean-forward="true" selection-start-line="81" selection-start-column="58" selection-end-line="81" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="472">
-          <caret line="118" column="59" selection-start-line="118" selection-start-column="59" selection-end-line="118" selection-end-column="59" />
-          <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-198">
-          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="69" column="32" lean-forward="true" selection-start-line="69" selection-start-column="32" selection-end-line="70" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="142" column="59" lean-forward="true" selection-start-line="142" selection-start-column="59" selection-end-line="142" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="349" column="9" lean-forward="true" selection-start-line="349" selection-start-column="9" selection-end-line="349" selection-end-column="9" />
-          <folding>
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="e#12105#12121#0" expanded="true" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-686">
-          <caret line="67" column="31" lean-forward="true" selection-start-line="67" selection-start-column="31" selection-end-line="67" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="93" column="24" lean-forward="true" selection-start-line="93" selection-start-column="24" selection-end-line="93" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="57" column="23" lean-forward="true" selection-start-line="57" selection-start-column="23" selection-end-line="57" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-408">
-          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="98" column="40" lean-forward="true" selection-start-line="98" selection-start-column="40" selection-end-line="98" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="572">
@@ -925,13 +735,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="328" column="32" lean-forward="true" selection-start-line="328" selection-start-column="32" selection-end-line="328" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
@@ -950,16 +753,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="396">
           <caret line="23" column="32" lean-forward="true" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
-          <folding>
-            <element signature="e#2635#2636#0" expanded="true" />
-            <element signature="e#2671#2672#0" expanded="true" />
-            <element signature="e#2727#2728#0" expanded="true" />
-            <element signature="e#2777#2778#0" expanded="true" />
-            <element signature="e#2877#2878#0" expanded="true" />
-            <element signature="e#2911#2912#0" expanded="true" />
-            <element signature="e#2963#2964#0" expanded="true" />
-            <element signature="e#3009#3010#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -972,14 +765,481 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+        <state relative-caret-position="66">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="59" column="46" lean-forward="true" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3586">
+          <caret line="179" column="16" selection-start-line="179" selection-start-column="16" selection-end-line="179" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5478">
+          <caret line="273" column="3" selection-start-line="273" selection-start-column="3" selection-end-line="273" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1870">
+          <caret line="147" column="11" selection-start-line="147" selection-start-column="11" selection-end-line="147" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="55" column="15" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="106">
+          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="290" column="41" lean-forward="true" selection-start-line="290" selection-start-column="41" selection-end-line="290" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="21" column="32" lean-forward="true" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="550">
+          <caret line="38" column="89" selection-start-line="38" selection-start-column="89" selection-end-line="38" selection-end-column="89" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="11" column="28" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1166">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="818">
+          <caret line="285" column="13" lean-forward="true" selection-start-line="285" selection-start-column="13" selection-end-line="285" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="129" column="31" lean-forward="true" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="323" column="72" lean-forward="true" selection-start-line="323" selection-start-column="72" selection-end-line="323" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="44" column="13" lean-forward="true" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-638">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="244">
+          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="157">
+          <caret line="16" column="55" lean-forward="true" selection-start-line="16" selection-start-column="55" selection-end-line="16" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="270" column="33" lean-forward="true" selection-start-line="270" selection-start-column="33" selection-end-line="270" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="490">
+          <caret line="141" selection-start-line="141" selection-end-line="141" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="164" column="5" lean-forward="true" selection-start-line="164" selection-start-column="5" selection-end-line="164" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/apiTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-242">
+          <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="61" column="16" lean-forward="true" selection-start-line="61" selection-start-column="16" selection-end-line="61" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="700">
+          <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="12" column="34" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="39" column="9" lean-forward="true" selection-start-line="39" selection-start-column="9" selection-end-line="39" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="32" column="29" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="29" />
           <folding>
-            <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-            <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#1838#1839#0" expanded="true" />
+            <element signature="e#1863#1864#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1925#1926#0" expanded="true" />
+            <element signature="e#1822#1823#0" expanded="true" />
+            <element signature="e#1851#1852#0" expanded="true" />
+            <element signature="e#1895#1896#0" expanded="true" />
+            <element signature="e#1931#1932#0" expanded="true" />
+            <element signature="e#2132#2133#0" expanded="true" />
+            <element signature="e#2164#2165#0" expanded="true" />
+            <element signature="e#2214#2215#0" expanded="true" />
+            <element signature="e#2256#2257#0" expanded="true" />
+            <element signature="e#2330#2331#0" expanded="true" />
+            <element signature="e#2370#2371#0" expanded="true" />
+            <element signature="e#2436#2437#0" expanded="true" />
+            <element signature="e#2494#2495#0" expanded="true" />
+            <element signature="e#2569#2570#0" expanded="true" />
+            <element signature="e#2602#2603#0" expanded="true" />
+            <element signature="e#2654#2655#0" expanded="true" />
+            <element signature="e#2698#2699#0" expanded="true" />
+            <element signature="e#2764#2765#0" expanded="true" />
+            <element signature="e#2795#2796#0" expanded="true" />
+            <element signature="e#2843#2844#0" expanded="true" />
+            <element signature="e#2883#2884#0" expanded="true" />
+            <element signature="e#2948#2949#0" expanded="true" />
+            <element signature="e#2980#2981#0" expanded="true" />
+            <element signature="e#3030#3031#0" expanded="true" />
+            <element signature="e#3072#3073#0" expanded="true" />
+            <element signature="e#3134#3135#0" expanded="true" />
+            <element signature="e#3162#3163#0" expanded="true" />
+            <element signature="e#3204#3205#0" expanded="true" />
+            <element signature="e#3238#3239#0" expanded="true" />
+            <element signature="e#3307#3308#0" expanded="true" />
+            <element signature="e#3346#3347#0" expanded="true" />
+            <element signature="e#3410#3411#0" expanded="true" />
+            <element signature="e#3466#3467#0" expanded="true" />
+            <element signature="e#3537#3538#0" expanded="true" />
+            <element signature="e#3567#3568#0" expanded="true" />
+            <element signature="e#3613#3614#0" expanded="true" />
+            <element signature="e#3651#3652#0" expanded="true" />
+            <element signature="e#3721#3722#0" expanded="true" />
+            <element signature="e#3759#3760#0" expanded="true" />
+            <element signature="e#3821#3822#0" expanded="true" />
+            <element signature="e#3875#3876#0" expanded="true" />
+            <element signature="e#3953#3954#0" expanded="true" />
+            <element signature="e#3991#3992#0" expanded="true" />
+            <element signature="e#4053#4054#0" expanded="true" />
+            <element signature="e#4107#4108#0" expanded="true" />
+            <element signature="e#4186#4187#0" expanded="true" />
+            <element signature="e#4225#4226#0" expanded="true" />
+            <element signature="e#4289#4290#0" expanded="true" />
+            <element signature="e#4345#4346#0" expanded="true" />
+            <element signature="e#4430#4431#0" expanded="true" />
+            <element signature="e#4474#4475#0" expanded="true" />
+            <element signature="e#4698#4699#0" expanded="true" />
+            <element signature="e#4740#4741#0" expanded="true" />
+            <element signature="e#4810#4811#0" expanded="true" />
+            <element signature="e#4872#4873#0" expanded="true" />
+            <element signature="e#4955#4956#0" expanded="true" />
+            <element signature="e#4994#4995#0" expanded="true" />
+            <element signature="e#5058#5059#0" expanded="true" />
+            <element signature="e#5114#5115#0" expanded="true" />
+            <element signature="e#5194#5195#0" expanded="true" />
+            <element signature="e#5233#5234#0" expanded="true" />
+            <element signature="e#5297#5298#0" expanded="true" />
+            <element signature="e#5353#5354#0" expanded="true" />
+            <element signature="e#5428#5429#0" expanded="true" />
+            <element signature="e#5462#5463#0" expanded="true" />
+            <element signature="e#5516#5517#0" expanded="true" />
+            <element signature="e#5562#5563#0" expanded="true" />
+            <element signature="e#5634#5635#0" expanded="true" />
+            <element signature="e#5670#5671#0" expanded="true" />
+            <element signature="e#5728#5729#0" expanded="true" />
+            <element signature="e#5778#5779#0" expanded="true" />
+            <element signature="e#5852#5853#0" expanded="true" />
+            <element signature="e#5888#5889#0" expanded="true" />
+            <element signature="e#5946#5947#0" expanded="true" />
+            <element signature="e#5996#5997#0" expanded="true" />
+            <element signature="e#6067#6068#0" expanded="true" />
+            <element signature="e#6100#6101#0" expanded="true" />
+            <element signature="e#6152#6153#0" expanded="true" />
+            <element signature="e#6196#6197#0" expanded="true" />
+            <element signature="e#6261#6262#0" expanded="true" />
+            <element signature="e#6291#6292#0" expanded="true" />
+            <element signature="e#6337#6338#0" expanded="true" />
+            <element signature="e#6375#6376#0" expanded="true" />
+            <element signature="e#6437#6438#0" expanded="true" />
+            <element signature="e#6467#6468#0" expanded="true" />
+            <element signature="e#6513#6514#0" expanded="true" />
+            <element signature="e#6551#6552#0" expanded="true" />
+            <element signature="e#6613#6614#0" expanded="true" />
+            <element signature="e#6643#6644#0" expanded="true" />
+            <element signature="e#6689#6690#0" expanded="true" />
+            <element signature="e#6727#6728#0" expanded="true" />
+            <element signature="e#6796#6797#0" expanded="true" />
+            <element signature="e#6829#6830#0" expanded="true" />
+            <element signature="e#6881#6882#0" expanded="true" />
+            <element signature="e#6925#6926#0" expanded="true" />
+            <element signature="e#6995#6996#0" expanded="true" />
+            <element signature="e#7030#7031#0" expanded="true" />
+            <element signature="e#7086#7087#0" expanded="true" />
+            <element signature="e#7134#7135#0" expanded="true" />
+            <element signature="e#7202#7203#0" expanded="true" />
+            <element signature="e#7233#7234#0" expanded="true" />
+            <element signature="e#7281#7282#0" expanded="true" />
+            <element signature="e#7321#7322#0" expanded="true" />
+            <element signature="e#7390#7391#0" expanded="true" />
+            <element signature="e#7426#7427#0" expanded="true" />
+            <element signature="e#7484#7485#0" expanded="true" />
+            <element signature="e#7534#7535#0" expanded="true" />
+            <element signature="e#7602#7603#0" expanded="true" />
+            <element signature="e#7636#7637#0" expanded="true" />
+            <element signature="e#7690#7691#0" expanded="true" />
+            <element signature="e#7736#7737#0" expanded="true" />
+            <element signature="e#7806#7807#0" expanded="true" />
+            <element signature="e#7840#7841#0" expanded="true" />
+            <element signature="e#7894#7895#0" expanded="true" />
+            <element signature="e#7940#7941#0" expanded="true" />
+            <element signature="e#8006#8007#0" expanded="true" />
+            <element signature="e#8036#8037#0" expanded="true" />
+            <element signature="e#8082#8083#0" expanded="true" />
+            <element signature="e#8120#8121#0" expanded="true" />
+            <element signature="e#8189#8190#0" expanded="true" />
+            <element signature="e#8226#8227#0" expanded="true" />
+            <element signature="e#8286#8287#0" expanded="true" />
+            <element signature="e#8338#8339#0" expanded="true" />
+            <element signature="e#8417#8418#0" expanded="true" />
+            <element signature="e#8457#8458#0" expanded="true" />
+            <element signature="e#8523#8524#0" expanded="true" />
+            <element signature="e#8581#8582#0" expanded="true" />
+            <element signature="e#8655#8656#0" expanded="true" />
+            <element signature="e#8687#8688#0" expanded="true" />
+            <element signature="e#8737#8738#0" expanded="true" />
+            <element signature="e#8779#8780#0" expanded="true" />
+            <element signature="e#8846#8847#0" expanded="true" />
+            <element signature="e#8879#8880#0" expanded="true" />
+            <element signature="e#8931#8932#0" expanded="true" />
+            <element signature="e#8975#8976#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#787#788#0" expanded="true" />
+            <element signature="e#817#818#0" expanded="true" />
+            <element signature="e#2105#2106#0" expanded="true" />
+            <element signature="e#2135#2136#0" expanded="true" />
+            <element signature="e#2431#2432#0" expanded="true" />
+            <element signature="e#2461#2462#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index 854f1f1..0db633a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -165,12 +165,16 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String startDay,String endDay) {
+    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew) {
         try {
 
             Criteria criteria = createCriteria(PgAlarm.class);
             criteria.addOrder(Order.desc("id"));
 
+            if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) {
+                criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
+            }
+
             if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay))
             {
                 criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay)));
@@ -193,9 +197,11 @@
 
                 criteria.add(Restrictions.le("alarmDate",date));
             }
+            if(StringUtils.isNotBlank(isNew)&&isNew.equals("true"))
+                criteria.add(Restrictions.eq("active", 1));
 
             List<PgAlarm> pgAlarmList = criteria.list();
-            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
     }
 
     //根据设备位置(仓位)获取摄像机列表
-    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+    public List<PgDeviceDto> getPgCameraListByPosition(String partition,String position){
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.like("position",position+"%"));
-//        criteria.add(Restrictions.eq("devType","球机"));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(position))
+            criteria.add(Restrictions.like("position",position+"%"));
+
         criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
 
         List<PgDevice> pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
             dto.setDevCode(objects[5].toString());
             dto.setDevType(objects[6].toString());
             if(objects[7]!=null)
-            dto.setIp(objects[7].toString());
+                dto.setIp(objects[7].toString());
             dto.setIsOpen(objects[8].toString());
             dto.setPartition(objects[11].toString());
             dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index 8ebf74d..3c657a7 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgEquipment;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
 import com.casic.PgInterface.devTable.dto.PgEquipmentDto;
@@ -34,9 +35,12 @@
     public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
-        criteria.add(Restrictions.eq("eqName",eqName));
-        criteria.add(Restrictions.eq("eqCode",eqCode));
-        criteria.add(Restrictions.eq("eqType",eqType));
+        if(StringUtils.isNotBlank(eqName))
+            criteria.add(Restrictions.eq("eqName",eqName));
+        if(StringUtils.isNotBlank(eqCode))
+            criteria.add(Restrictions.eq("eqCode",eqCode));
+        if(StringUtils.isNotBlank(eqType))
+            criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
@@ -51,10 +55,9 @@
 
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
-        //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
         String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
-        +eqType+"' group by equipment.EQ_NAME";
+                +eqType+"' group by equipment.EQ_NAME";
 
         List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4ed68e4..e413a5c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
@@ -39,7 +40,8 @@
 
     public List<PgPipeLineDto> getPipeLineByLineType(String lineType) {
         Criteria criteria = createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineType", lineType));
+        if(StringUtils.isNotBlank(lineType))
+            criteria.add(Restrictions.eq("lineType", lineType));
 
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    private Long id;
-    private String keyId;//巡检记录单id
-    private String planId;//巡检计划ID
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    @Column(name="KEY_ID")
-    public String getKeyId() {
-        return keyId;
-    }
-
-    public void setKeyId(String keyId) {
-        this.keyId = keyId;
-    }
-
-    @Column(name="PLAN_ID")
-    public String getPlanId() {
-        return planId;
-    }
-
-    public void setPlanId(String planId) {
-        this.planId = planId;
-    }
-
-    @Column(name="CREATE_DATE")
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    @Column(name="STATE")
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    @Column(name="CREATOR")
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    @Column(name="PLAN_NAME")
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    @Column(name="RECORD_NO")
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    @Column(name="PLAN_NO")
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    @Column(name="RESPONSIBIE_DEPT")
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    @Column(name="INSPECTION_PERSON")
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    @Column(name="PATROL_MAN")
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    @Column(name="OPERATE_DATE")
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    @Column(name="REMARK")
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Column(name="BUILD_CABIN")
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    @Column(name="PROJECT")
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    @Column(name="START_PILE_NO")
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    @Column(name="END_PILE_NO")
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    @Column(name="INSPECTION_PRACE")
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    @Column(name="OTHER_PATROL_MAN")
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private Long id;
+    private String KEY_ID;//唯一键值
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_PERSON;//巡检人
+    private String START_DATE;//巡检开始时间
+    private String END_DATE;
+    private String FREQUENCY;//巡检频率
+    private String STATE;//状态
+    private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+    private String PLAN_NO;//巡检计划编号
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_MODE;//巡检方式
+    private String INSPECTION_ROUTE;//巡检路线
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String INSPECTION_GROUP;//巡检部门
+    private String INSERT_TIME;//插入时间
+    private String FREQUENCYDATE;//巡检具体日期
+    private String FREQUENCYTIME;//巡检具体时间
+    private String CREATEDATE;//创建时间
+    private String CREATOR;//创建人
+    private String PROJECT;//项目
+    private String COMLILE;//编制人
+    private String START_TIME;//编制时间
+    private String DEVELOP_DEPT;//制定部门
+    private String END_TIME;//结束时间
+    private String START_PILE_NO;//开始桩号
+    private String END_PILE_NO;//结束桩号
+    private String BUILD_CABIN;//巡检舱室
+    private String MILEAGE;
+    private String FREQUENCY_TIME;//巡检具体时间
+    private String FREQUENCYTIME_END;
+    private String KETTLE_TS;
+    private String UPDATEDATE;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="KEY_ID")
+    public String getKEY_ID() {
+        return KEY_ID;
+    }
+
+    public void setKEY_ID(String KEY_ID) {
+        this.KEY_ID = KEY_ID;
+    }
+
+    @Column(name="PLAN_NAME")
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    @Column(name="INSPECTION_PERSON")
+    public String getINSPECTION_PERSON() {
+        return INSPECTION_PERSON;
+    }
+
+    public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+        this.INSPECTION_PERSON = INSPECTION_PERSON;
+    }
+
+    @Column(name="START_DATE")
+    public String getSTART_DATE() {
+        return START_DATE;
+    }
+
+    public void setSTART_DATE(String START_DATE) {
+        this.START_DATE = START_DATE;
+    }
+
+    @Column(name="END_DATE")
+    public String getEND_DATE() {
+        return END_DATE;
+    }
+
+    public void setEND_DATE(String END_DATE) {
+        this.END_DATE = END_DATE;
+    }
+
+    @Column(name="FREQUENCY")
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    @Column(name="STATE")
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    @Column(name="RESPONSIBLE_DEPT")
+    public String getRESPONSIBLE_DEPT() {
+        return RESPONSIBLE_DEPT;
+    }
+
+    public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+        this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+    }
+
+    @Column(name="PLAN_NO")
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    @Column(name="INSPECTION_TYPE")
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    @Column(name="INSPECTION_MODE")
+    public String getINSPECTION_MODE() {
+        return INSPECTION_MODE;
+    }
+
+    public void setINSPECTION_MODE(String INSPECTION_MODE) {
+        this.INSPECTION_MODE = INSPECTION_MODE;
+    }
+
+    @Column(name="INSPECTION_ROUTE")
+    public String getINSPECTION_ROUTE() {
+        return INSPECTION_ROUTE;
+    }
+
+    public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+        this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+    }
+
+    @Column(name="INSPECTION_START_TIME")
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    @Column(name="INSPECTION_END_TIME")
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    @Column(name="INSPECTION_PRACE")
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    @Column(name="INSPECTION_GROUP")
+    public String getINSPECTION_GROUP() {
+        return INSPECTION_GROUP;
+    }
+
+    public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+        this.INSPECTION_GROUP = INSPECTION_GROUP;
+    }
+
+    @Column(name="INSERT_TIME")
+    public String getINSERT_TIME() {
+        return INSERT_TIME;
+    }
+
+    public void setINSERT_TIME(String INSERT_TIME) {
+        this.INSERT_TIME = INSERT_TIME;
+    }
+
+    @Column(name="FREQUENCYDATE")
+    public String getFREQUENCYDATE() {
+        return FREQUENCYDATE;
+    }
+
+    public void setFREQUENCYDATE(String FREQUENCYDATE) {
+        this.FREQUENCYDATE = FREQUENCYDATE;
+    }
+
+    @Column(name="FREQUENCYTIME")
+    public String getFREQUENCYTIME() {
+        return FREQUENCYTIME;
+    }
+
+    public void setFREQUENCYTIME(String FREQUENCYTIME) {
+        this.FREQUENCYTIME = FREQUENCYTIME;
+    }
+
+    @Column(name="CREATEDATE")
+    public String getCREATEDATE() {
+        return CREATEDATE;
+    }
+
+    public void setCREATEDATE(String CREATEDATE) {
+        this.CREATEDATE = CREATEDATE;
+    }
+
+    @Column(name="CREATOR")
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    @Column(name="PROJECT")
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    @Column(name="COMLILE")
+    public String getCOMLILE() {
+        return COMLILE;
+    }
+
+    public void setCOMLILE(String COMLILE) {
+        this.COMLILE = COMLILE;
+    }
+
+    @Column(name="START_TIME")
+    public String getSTART_TIME() {
+        return START_TIME;
+    }
+
+    public void setSTART_TIME(String START_TIME) {
+        this.START_TIME = START_TIME;
+    }
+
+    @Column(name="DEVELOP_DEPT")
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    @Column(name="END_TIME")
+    public String getEND_TIME() {
+        return END_TIME;
+    }
+
+    public void setEND_TIME(String END_TIME) {
+        this.END_TIME = END_TIME;
+    }
+
+    @Column(name="START_PILE_NO")
+    public String getSTART_PILE_NO() {
+        return START_PILE_NO;
+    }
+
+    public void setSTART_PILE_NO(String START_PILE_NO) {
+        this.START_PILE_NO = START_PILE_NO;
+    }
+
+    @Column(name="END_PILE_NO")
+    public String getEND_PILE_NO() {
+        return END_PILE_NO;
+    }
+
+    public void setEND_PILE_NO(String END_PILE_NO) {
+        this.END_PILE_NO = END_PILE_NO;
+    }
+
+    @Column(name="BUILD_CABIN")
+    public String getBUILD_CABIN() {
+        return BUILD_CABIN;
+    }
+
+    public void setBUILD_CABIN(String BUILD_CABIN) {
+        this.BUILD_CABIN = BUILD_CABIN;
+    }
+
+    @Column(name="MILEAGE")
+    public String getMILEAGE() {
+        return MILEAGE;
+    }
+
+    public void setMILEAGE(String MILEAGE) {
+        this.MILEAGE = MILEAGE;
+    }
+
+    @Column(name="FREQUENCY_TIME")
+    public String getFREQUENCY_TIME() {
+        return FREQUENCY_TIME;
+    }
+
+    public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+        this.FREQUENCY_TIME = FREQUENCY_TIME;
+    }
+
+    @Column(name="FREQUENCYTIME_END")
+    public String getFREQUENCYTIME_END() {
+        return FREQUENCYTIME_END;
+    }
+
+    public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+        this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+    }
+
+    @Column(name="KETTLE_TS")
+    public String getKETTLE_TS() {
+        return KETTLE_TS;
+    }
+
+    public void setKETTLE_TS(String KETTLE_TS) {
+        this.KETTLE_TS = KETTLE_TS;
+    }
+
+    @Column(name="UPDATEDATE")
+    public String getUPDATEDATE() {
+        return UPDATEDATE;
+    }
+
+    public void setUPDATEDATE(String UPDATEDATE) {
+        this.UPDATEDATE = UPDATEDATE;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 5346b57..2f8d359 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -66,7 +66,7 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REPAIRMAN")
+    @Column(name="REOAIRMAN")
     public String getRepairMan() {
         return repairMan;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
-    private Long id;
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-
-
-    public static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
-        PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
-        pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
-        pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
-        pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
-        pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
-        pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
-        pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
-        pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
-        pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
-        pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
-        pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
-        pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
-        pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
-        pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
-        pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
-        return pgAssetInSpectionRecordDto;
-    }
-
-
-    public static List<PgAssetInSpectionRecordDto> ConvertToDtoList(List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList){
-        List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-        for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
-            pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
-        }
-
-        return pgAssetInSpectionRecordDtoList;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
-    private String num;
-    private String createDate;
-
-    public String getNum() {
-        return num;
-    }
-
-    public void setNum(String num) {
-        this.num = num;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+    private Long id;
+    private String PLAN_NO;//巡检计划编号
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String FREQUENCY;//巡检频率
+    private String CREATOR;//创建人
+    private String DEVELOP_DEPT;//制定部门
+    private String PROJECT;//项目
+    private String STATE;//状态
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+        PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+        pgAssetPlanDto.setId(pgAssetPlan.getId());
+        pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+        pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+        pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+        pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+        pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+        pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+        pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+        pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+        pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+        pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+        pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+        return pgAssetPlanDto;
+    }
+
+    public static List<PgAssetPlanDto> ConvertToPgAssetDtoList(List<PgAssetPlan> pgAssetPlanList){
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
+
+        for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+            pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+        }
+
+        return pgAssetPlanDtoList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
new file mode 100644
index 0000000..bc12db1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
@@ -0,0 +1,24 @@
+package com.casic.PgInterface.maintenance.dto;
+
+public class PgAssetPlanStatic {
+
+    private String num;
+    private String createDate;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
deleted file mode 100644
index c41ca7d..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.casic.PgInterface.maintenance.manager;
-
-import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
-
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
-        try {
-            String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
-                    "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
-                    "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-
-            if(patrolMan!=null)
-                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
-            if(startTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
-            if(endTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')<to_date('"+endTime+"','yyyy-MM-dd')";
-
-            sql+=" order by id";
-
-            List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
-
-            List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList=new ArrayList<>();
-            for(Object[] objects1:objects){
-                PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord();
-
-                pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString()));
-                pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1]));
-                pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2]));
-                pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3]));
-                pgAssetInSpectionRecord.setState(String.valueOf(objects1[4]));
-                pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5]));
-                pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6]));
-                pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7]));
-                pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8]));
-                pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9]));
-                pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10]));
-                pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11]));
-                pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12]));
-                pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13]));
-                pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14]));
-                pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15]));
-                pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16]));
-                pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17]));
-                pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18]));
-                pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19]));
-
-                pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord);
-            }
-
-            List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-            for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList)
-            {
-                pgAssetInSpectionRecordDtoList.add(PgAssetInSpectionRecordDto.ConvertToDto(pgAssetInSpectionRecord));
-            }
-
-            return pgAssetInSpectionRecordDtoList;
-        }
-        catch(Exception e)
-        {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public List<PgAssetInSpectionRecordStatic> getPgAssetInSpectionRecordStaticLisByTime(
-            String startTime, String endTime, String staticType) {
-
-        String sql="";
-        String dateType="";
-        List<PgAssetInSpectionRecordStatic> pgAssetInSpectionRecordStaticList=new ArrayList<>();
-        int type=Integer.valueOf(staticType);
-
-        switch(type) {
-            case 0://年
-                dateType = "yyyy";
-                break;
-            case 1://月
-                dateType = "yyyy-mm";
-                break;
-            case 2://周
-                dateType = "iw";
-                break;
-            case 3://日
-                dateType="yyyy-mm-dd";
-                break;
-            default:
-                break;
-        }
-
-        sql="select count(*), to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_RECORD t where 1=1";
-
-        if(startTime!=null)
-            sql+=" and t.CREATE_DATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
-        if(endTime!=null)
-            sql+=" and t.CREATE_DATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
-
-        sql+=" group by to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"')";
-
-        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
-        for(int i=0;i<objects.size();i++)
-        {
-            PgAssetInSpectionRecordStatic pgAssetInSpectionRecordStatic=new PgAssetInSpectionRecordStatic();
-            pgAssetInSpectionRecordStatic.setNum(objects.get(i)[0].toString());
-            pgAssetInSpectionRecordStatic.setCreateDate(objects.get(i)[1].toString());
-            pgAssetInSpectionRecordStaticList.add(pgAssetInSpectionRecordStatic);
-        }
-        return pgAssetInSpectionRecordStaticList;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
new file mode 100644
index 0000000..bb6bf1e
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
@@ -0,0 +1,81 @@
+package com.casic.PgInterface.maintenance.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgAssetPlanManager extends HibernateEntityDao<PgAssetPlan> {
+
+    public List<PgAssetPlanDto> getPgAssetPlanDtoList(String inSpectionPlace){
+        Criteria criteria=createCriteria(PgAssetPlan.class);
+
+        if(StringUtils.isNotBlank(inSpectionPlace))
+            criteria.add(Restrictions.like("INSPECTION_PRACE","%"+inSpectionPlace+"%"));
+        criteria.addOrder(Order.desc("id"));
+
+        List<PgAssetPlan> pgAssetPlanList=criteria.list();
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=PgAssetPlanDto.ConvertToPgAssetDtoList(pgAssetPlanList);
+
+        if(pgAssetPlanDtoList==null||pgAssetPlanDtoList.size()==0)
+            return null;
+        else
+            return pgAssetPlanDtoList;
+    }
+
+    public List<PgAssetPlanStatic> getPgAssetPlanStaticLisByTime(
+            String startTime, String endTime, String staticType) {
+
+        String sql="";
+        String dateType="";
+        List<PgAssetPlanStatic> pgAssetPlanStaticList=new ArrayList<>();
+        int type=Integer.valueOf(staticType);
+
+        switch(type) {
+            case 0://年
+                dateType = "yyyy";
+                break;
+            case 1://月
+                dateType = "yyyy-mm";
+                break;
+            case 2://周
+                dateType = "iw";
+                break;
+            case 3://日
+                dateType="yyyy-mm-dd";
+                break;
+            default:
+                break;
+        }
+
+        sql="select count(*), to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_PLAN t where 1=1";
+
+        if(startTime!=null)
+            sql+=" and t.CREATEDATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
+        if(endTime!=null)
+            sql+=" and t.CREATEDATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
+
+        sql+=" group by to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"')";
+
+        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
+        for(int i=0;i<objects.size();i++)
+        {
+            PgAssetPlanStatic pgAssetPlanStatic=new PgAssetPlanStatic();
+            pgAssetPlanStatic.setNum(objects.get(i)[0].toString());
+            pgAssetPlanStatic.setCreateDate(objects.get(i)[1].toString());
+            pgAssetPlanStaticList.add(pgAssetPlanStatic);
+        }
+        return pgAssetPlanStaticList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 0903f22..3484739 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -15,7 +15,7 @@
 
     public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
             if(repairMan!=null)
                 sql+=" and REPAIRMAN like '%"+repairMan+"%'";
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index 9cc2881..6d90d7b 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -1,5 +1,7 @@
 package com.casic.PgInterface.patroler.dto;
 
+import com.casic.PgInterface.devTable.domain.PgDevice;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 
 /**
@@ -14,6 +16,7 @@
     private String unit;//单位
     private String alarmType;//报警类型
     private Long pgDeviceId;//设备编号
+    private String assetCode;//资产编号
 
     public Long getId() {
         return id;
@@ -71,7 +74,15 @@
         this.pgDeviceId = pgDeviceId;
     }
 
-    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
+    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule, PgDeviceManager pgDeviceManager) {
         this.setId(pgAlarmRule.getId());
         this.setHighValue(pgAlarmRule.getHighValue());
         this.setLowValue(pgAlarmRule.getLowValue());
@@ -82,6 +93,10 @@
         else
             this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
         this.setPgDeviceId(pgAlarmRule.getPgDeviceId());
+        if(pgAlarmRule.getAlarmTypeId()!=null&&pgDeviceManager.get(pgAlarmRule.getPgDeviceId())!=null)
+            this.setAssetCode(pgDeviceManager.get(pgAlarmRule.getPgDeviceId()).getAssetCode());
+        else
+            this.setAssetCode("");
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
index c132c98..a7cef5b 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
@@ -1,13 +1,17 @@
 package com.casic.PgInterface.patroler.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.ResponseStatus;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -17,30 +21,23 @@
 @Service
 public class PgAlarmRuleManager extends HibernateEntityDao<PgAlarmRule> {
 
+    @Resource
+    private PgDeviceManager pgDeviceManager;
+
     //根据设备获取设备报警阈值
-    public List<PgAlarmRuleDto>  getAlarmRuleDto() {
+    public List<PgAlarmRuleDto>  getAlarmRuleDto(String devType) {
         Criteria criteria=createCriteria(PgAlarmRule.class);
+
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.eq("devType", devType));
         criteria.addOrder(Order.desc("id"));
 
         List<PgAlarmRule> pgAlarmRuleList=criteria.list();
-        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
+        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         for (PgAlarmRule pgAlarmRule : pgAlarmRuleList) {
-            pgAlarmRuleDtoList.add(new PgAlarmRuleDto(pgAlarmRule));
+            pgAlarmRuleDtoList.add(new PgAlarmRuleDto(pgAlarmRule,pgDeviceManager));
         }
         return pgAlarmRuleDtoList;
-
     }
 
-    public PgAlarmRule getAlarmRuleBydevType(String devType) {
-        Criteria criteria=createCriteria(PgAlarmRule.class);
-        criteria.add(Restrictions.eq("devType", devType));
-
-        List<PgAlarmRule> pgAlarmRuleList=criteria.list();
-
-        if(pgAlarmRuleList==null||pgAlarmRuleList.size()==0)
-            return null;
-        else
-            return pgAlarmRuleList.get(0);
-    }
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index d0e28f5..082ba5d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgAlarm;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
@@ -39,7 +40,7 @@
     private PgReservePlanManager pgReservePlanManager;
 
     /*
-    * 获取报警设备信息
+     * 获取报警设备信息
      */
     @POST
     @Path("linkDevice")
@@ -50,11 +51,22 @@
 
         PgDeviceDto pgDeviceDto = null;
         try {
-            PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
-            PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
-
-            pgDeviceDto=new PgDeviceDto(pgDevice);
-            msg = "报警关联设备获取成功";
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if (pgAlarm == null)
+                    msg = "不存在报警信息";
+                else {
+                    PgDevice pgDevice = pgAlarm.getAlarmDevId();
+                    if (pgDevice == null)
+                        msg = "不存在报警设备";
+                    else {
+                        pgDeviceDto = new PgDeviceDto(pgDevice);
+                        msg = "报警关联设备获取成功";
+                    }
+                }
+            }
+            else
+                msg="未接受到报警设备ID信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取关联设备失败";
@@ -77,11 +89,28 @@
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
-            PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
-            PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
-            pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if(pgAlarm==null)
+                    msg="不存在报警信息";
+                else {
+                    PgDevice pgDevice = pgAlarm.getAlarmDevId();
+                    if (pgDevice == null)
+                        msg = "不存在报警设备";
+                    else {
+                        String strPosition=pgDevice.getPosition();
+                        String position="";
+                        if(!strPosition.equals(""))
+                            position=pgDevice.getPosition().substring(0,3);
+                        String partition=pgDevice.getPartition();
 
-            msg = "关联设备获取成功";
+                        pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
+                        msg = "关联设备获取成功";
+                    }
+                }
+            }
+            else
+                msg="请输入报警设备Id信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "分区设备关联失败";
@@ -93,7 +122,7 @@
 
     /*
      * 根据报警记录获取关联的预案
-    */
+     */
     @POST
     @Path("linkReservePlan")
     @Produces(MediaType.APPLICATION_JSON)
@@ -103,10 +132,21 @@
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
-            PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
-            pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if (pgAlarm == null)
+                    msg = "不存在报警信息";
+                else {
+                    pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-            msg="关联预案获取成功";
+                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
+                        msg="不存在关联的报警预案";
+                    else
+                        msg = "关联预案获取成功";
+                }
+            }
+            else
+                msg="请输入报警信息";
         }
         catch(Exception e)
         {
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index d18ebb8..baacd93 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -48,14 +48,16 @@
     @POST
     @Path("getAlarmInfo")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmList(@FormParam("startDay") String startDay,
-                                            @FormParam("endDay") String endDay) throws Exception {
+    public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
+                                            @FormParam("startDay") String startDay,
+                                            @FormParam("endDay") String endDay,
+                                            @FormParam("isNew") String isNew) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(startDay,endDay);
-            if (pgAlarmDtoList.size() == 0)
+            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew);
+            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
                 msg = "没有报警信息";
             else
                 msg = "报警信息获取成功";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 87afd54..29ce8a4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -1,7 +1,5 @@
 package com.casic.PgInterface.rs;
 
-import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager;
-import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import com.casic.PgInterface.patroler.manager.PgAlarmRuleManager;
@@ -30,119 +28,23 @@
     private static Logger logger = LoggerFactory.getLogger(PgAlarmRule.class);
 
     @Resource
-    private PgDeviceManager pgDeviceManager;
-    @Resource
-    private PgAlarmTypeManager pgAlarmTypeManager;
-    @Resource
     private PgAlarmRuleManager pgAlarmRuleManager;
 
-
-
-    /**
-     * 新增报警阈值
-     */
-    @POST
-    @Path("addAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> addAlarmRule(@FormParam("highValue") String highValue,
-                                            @FormParam("lowValue") String lowValue,
-                                            @FormParam("unit") String unit,
-                                            @FormParam("devType") String devType,
-                                            @FormParam("alarmType") String alarmType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType);
-            if (pgAlarmRule != null) {
-                result = "false";
-                msg = "设备阈值已经存在";
-            } else {
-                pgAlarmRule = new PgAlarmRule();
-                pgAlarmRule.setHighValue(highValue);
-                pgAlarmRule.setLowValue(lowValue);
-                pgAlarmRule.setDevType(devType);
-                pgAlarmRule.setUnit(unit);
-                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
-
-                pgAlarmRuleManager.save(pgAlarmRule);
-                result = "true";
-                msg = "报警阈值新增成功";
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = "false";
-            msg = "报警阈值新增失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-        return resultMap;
-    }
-
-    /**
-     * 编辑报警阈值
-     */
-    @POST
-    @Path("editAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> editAlarmRule(@FormParam("id") String id,
-                                             @FormParam("devType") String devType,
-                                             @FormParam("highValue") String highValue,
-                                             @FormParam("lowValue") String lowValue,
-                                             @FormParam("unit") String unit,
-                                             @FormParam("alarmType") String alarmType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
-            if (pgAlarmRule == null) {
-                msg = "不存在报警阈值记录";
-                result = "false";
-            } else {
-                pgAlarmRule.setDevType(devType);
-                pgAlarmRule.setHighValue(highValue);
-                pgAlarmRule.setLowValue(lowValue);
-                pgAlarmRule.setUnit(unit);
-                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
-
-                pgAlarmRuleManager.save(pgAlarmRule);
-                msg = "编辑成功";
-                result = "true";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            result = "false";
-            msg = "报警阈值编辑失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-
-        return resultMap;
-    }
-
     /**
      * 获取报警阈值信息
      */
     @POST
     @Path("getAlarmRule")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmRule() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+    public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
+        System.out.println("devType:"+devType);
+        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
-            pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto();
-            if (pgAlarmRuleDtoList == null)
+            pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
+            if (pgAlarmRuleDtoList == null||pgAlarmRuleDtoList.size()==0)
                 msg = "不存在报警阈值信息";
             else
                 msg = "报警阈值获取成功";
@@ -155,69 +57,4 @@
         return resultMap;
     }
 
-    /**
-     * 删除报警阈值
-     */
-    @POST
-    @Path("deleteAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> deleteAlarmRule(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
-            if (pgAlarmRule == null) {
-                msg = "不存在报警阈值记录";
-                result = "false";
-            } else {
-                pgAlarmRuleManager.remove(pgAlarmRule);
-                msg = "删除成功";
-                result = "true";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            result = "false";
-            msg = "报警阈值删除失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-
-        return resultMap;
-    }
-
-    /**
-     * 根据设备类型报警阈值
-     */
-    @POST
-    @Path("getAlarmRuleByDevType")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmRuleByDevType(@FormParam("devType") String devType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        PgAlarmRule pgAlarmRule = null;
-        List<PgAlarmRuleDto> pgAlarmRuleDtos = new ArrayList<>();
-        try {
-            pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType);
-            if (pgAlarmRule == null)
-                msg = "不存在报警阈值记录";
-            else {
-                PgAlarmRuleDto pgAlarmRuleDto= new PgAlarmRuleDto(pgAlarmRule);
-                pgAlarmRuleDtos.add(pgAlarmRuleDto);
-                msg = "报警阈值获取成功";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            msg = "报警阈值获取失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmRuleDtos);
-
-        return resultMap;
-    }
-
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
new file mode 100644
index 0000000..19d3b8c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanRs")
+public class PgAssetPlanRs {
+
+    @Resource
+    private PgAssetPlanManager pgAssetPlanManager;
+
+    /**
+     * 获取巡检记录
+     */
+    @POST
+    @Path("getPgAssetPlanList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPgAssetPlanList(@FormParam("inSpectionPlace") String inSpectionPlace){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
+        try{
+            pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(inSpectionPlace);
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
+                msg="巡检信息获取成功";
+            else
+                msg="不存在巡检信息";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="巡检信息获取失败";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAssetPlanDtoList);
+
+        return resultMap;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
new file mode 100644
index 0000000..47ef9d1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanStaticRs")
+public class PgAssetPlanStaticRs {
+
+    @Resource
+    private PgAssetPlanManager pgAssetPlanManager;
+
+    @POST
+    @Path("getPgAssetPlanStaticList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPgAssetPlanStaticList(@FormParam("startTime") String startTime,
+                                                       @FormParam("endTime") String endTime,
+                                                       @FormParam("staticType") String staticType) throws Exception{
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
+        try{
+            pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
+                msg="巡检统计信息获取成功";
+            else
+                msg="统计信息获取失败";
+        }
+        catch (Exception ex){
+            ex.printStackTrace();
+            msg="统计失败";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAssetPlanStaticList);
+
+        return resultMap;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
deleted file mode 100644
index 66f4d09..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.manager.PgAssetInSpectionRecordManager;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@Path("pgAssetRecordRs")
-public class PgAssetRecordRs {
-
-    @Resource
-    private PgAssetInSpectionRecordManager pgAssetInSpectionRecordManager;
-
-    /**
-     * 获取巡检记录
-     */
-    @POST
-    @Path("getPgAssetRecordList")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgAssetRecordList(@FormParam("patrolMan") String patrolMan,
-                                                   @FormParam("startTime") String startTime,
-                                                   @FormParam("endTime") String endTime){
-        Map<String,Object> resultMap=new HashMap<>();
-        String msg="";
-
-        List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-        try{
-            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(patrolMan,startTime,endTime);
-            if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0)
-                msg="巡检信息获取成功";
-            else
-                msg="不存在巡检信息";
-        }
-        catch(Exception ex){
-            ex.printStackTrace();
-            msg="巡检信息获取失败";
-        }
-
-        resultMap.put("msg",msg);
-        resultMap.put("result",pgAssetInSpectionRecordDtoList);
-
-        return resultMap;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java
deleted file mode 100644
index 5f0417a..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import com.casic.PgInterface.maintenance.manager.PgAssetInSpectionRecordManager;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@Path("pgAssetRecordStaticRs")
-public class PgAssetRecordStaticRs {
-
-    @Resource
-    private PgAssetInSpectionRecordManager pgAssetInSpectionRecordManager;
-
-    @POST
-    @Path("getPgAssetRecordHeadStaticList")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgAssetRecordHeadStaticList(@FormParam("startTime") String startTime,
-                                                                @FormParam("endTime") String endTime,
-                                                                @FormParam("staticType") String staticType) throws Exception{
-        Map<String,Object> resultMap=new HashMap<>();
-        String msg="";
-        String result="";
-
-        List<PgAssetInSpectionRecordStatic> pgAssetInSpectionRecordStaticList = null;
-        try{
-            pgAssetInSpectionRecordStaticList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetInSpectionRecordStaticList!=null&&pgAssetInSpectionRecordStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
-            else
-                msg="统计信息获取失败";
-        }
-        catch (Exception ex){
-            ex.printStackTrace();
-            msg="统计失败";
-        }
-
-        resultMap.put("msg",msg);
-        resultMap.put("result",pgAssetInSpectionRecordStaticList);
-
-        return resultMap;
-    }
-
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index 9dfdd88..a0245ba 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -326,7 +326,7 @@
 
             PgConstruction pgConstruction=pgConstructionManager.get(Long.valueOf(id));
 
-            pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(pgConstruction.getPgName());
+            pgDeviceDtoList=pgDeviceManager.getPgCameraListByPartition(pgConstruction.getPgName());
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index 1c8130c..c276fb3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -177,6 +177,7 @@
             else
             {
                 pgEquipment.setActive(0);
+                pgEquipmentManager.save(pgEquipment);
                 msg="删除成功";
                 result="true";
             }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index 486b49f..f0b936c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -287,7 +287,7 @@
         try {
             if (apCode != "") {
                 String apCodeStr=apCode.substring(0,3);
-                pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(apCodeStr);
+                pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition("",apCodeStr);
                 if(pgDeviceDtoList==null)
                     msg="不存在关联摄像机";
                 else
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 982e3d9..a6da81e 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -11,15 +11,13 @@
 
 
 # ============================================================================
-# dbd
+# db
 # ============================================================================
 db.default.driverClassName=oracle.jdbc.driver.OracleDriver
-db.default.url=jdbc:oracle:thin:@172.17.0.201:1521:szgl
-#db.default.url=jdbc:oracle:thin:@119.254.103.80:1521:chengdu
-db.default.username=scott
-db.default.password=scott
-#db.default.username=PG
-#db.default.password=PG
+#db.default.url=jdbc:oracle:thin:@172.17.0.201:1521:szgl
+db.default.url=jdbc:oracle:thin:@119.254.103.80:1521:chengdu
+db.default.username=PG
+db.default.password=PG
 
 
 # ============================================================================
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190828.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190828.docx"
new file mode 100644
index 0000000..7920004
--- /dev/null
+++ "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190828.docx"
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190828.docx" "b/~$\350\257\264\346\230\21620190828.docx"
new file mode 100644
index 0000000..575ddd4
--- /dev/null
+++ "b/~$\350\257\264\346\230\21620190828.docx"
Binary files differ
diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\21620190726.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\21620190726.docx"
deleted file mode 100644
index d320e29..0000000
--- "a/\346\216\245\345\217\243\350\257\264\346\230\21620190726.docx"
+++ /dev/null
Binary files differ
diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\21620190910.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\21620190910.docx"
new file mode 100644
index 0000000..0650e1e
--- /dev/null
+++ "b/\346\216\245\345\217\243\350\257\264\346\230\21620190910.docx"
Binary files differ
diff --git "a/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190612.docx" "b/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190612.docx"
deleted file mode 100644
index 2dccbc8..0000000
--- "a/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190612.docx"
+++ /dev/null
Binary files differ

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ff69e2a..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,27 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$数据库设计说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$说明20190828.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/接口说明20190910.docx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190828.docx" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -32,72 +42,119 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="2" />
-          <entry key="java" value="243" />
-          <entry key="properties" value="6" />
+          <entry key="java" value="321" />
+          <entry key="properties" value="8" />
           <entry key="xml" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="2" />
-          <entry key="JAVA" value="243" />
-          <entry key="Properties" value="6" />
+          <entry key="JAVA" value="321" />
+          <entry key="Properties" value="8" />
           <entry key="XML" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="8082" />
-          <entry key="properties" value="49" />
-          <entry key="txt" value="64" />
+          <entry key="dummy" value="16" />
+          <entry key="java" value="10723" />
+          <entry key="properties" value="59" />
+          <entry key="txt" value="118" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="8082" />
-          <entry key="PLAIN_TEXT" value="64" />
-          <entry key="Properties" value="49" />
+          <entry key="JAVA" value="10723" />
+          <entry key="PLAIN_TEXT" value="134" />
+          <entry key="Properties" value="59" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="4" />
+          <entry key="project.closed" value="28" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.2" value="1" />
           <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.24" value="1" />
+          <entry key="project.open.time.251" value="1" />
           <entry key="project.open.time.27" value="1" />
-          <entry key="project.open.time.3" value="3" />
-          <entry key="project.open.time.31" value="1" />
+          <entry key="project.open.time.28" value="1" />
+          <entry key="project.open.time.3" value="6" />
+          <entry key="project.open.time.31" value="2" />
           <entry key="project.open.time.37" value="1" />
+          <entry key="project.open.time.39" value="2" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.40" value="1" />
           <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="1" />
+          <entry key="project.open.time.44" value="2" />
           <entry key="project.open.time.45" value="2" />
           <entry key="project.open.time.48" value="1" />
           <entry key="project.open.time.49" value="1" />
+          <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.58" value="1" />
           <entry key="project.open.time.59" value="1" />
-          <entry key="project.open.time.71" value="1" />
+          <entry key="project.open.time.64" value="1" />
+          <entry key="project.open.time.71" value="2" />
           <entry key="project.open.time.76" value="1" />
-          <entry key="project.opened" value="25" />
+          <entry key="project.opened" value="41" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+            <state relative-caret-position="174">
+              <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
               <folding>
-                <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-                <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-                <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-                <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="352">
+              <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#787#788#0" expanded="true" />
+                <element signature="e#817#818#0" expanded="true" />
+                <element signature="e#2105#2106#0" expanded="true" />
+                <element signature="e#2135#2136#0" expanded="true" />
+                <element signature="e#2431#2432#0" expanded="true" />
+                <element signature="e#2461#2462#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="638">
+              <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+              <folding>
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -122,6 +179,7 @@
       <find>getPgDeviceByDevType</find>
       <find>message</find>
       <find>getConstructionByType</find>
+      <find>getPgCameraListByPosition</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -130,24 +188,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanTypeDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java" />
@@ -162,17 +207,38 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
       </list>
     </option>
   </component>
@@ -208,16 +274,18 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="3" />
-    <option name="y" value="10" />
-    <option name="width" value="1386" />
-    <option name="height" value="788" />
+    <option name="x" value="1410" />
+    <option name="y" value="117" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -258,7 +326,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -267,16 +335,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -286,7 +345,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="dto" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -296,7 +355,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
               <item name="manager" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -308,19 +367,10 @@
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="webapp" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -359,6 +409,7 @@
       </deployment>
       <server-settings>
         <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_7" />
+        <option name="JNDI_PORT" value="10991" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -456,7 +507,23 @@
       <workItem from="1566350810712" duration="6803000" />
       <workItem from="1566435787074" duration="10717000" />
       <workItem from="1566521753529" duration="14265000" />
-      <workItem from="1566614176989" duration="5693000" />
+      <workItem from="1566614176989" duration="14059000" />
+      <workItem from="1566780822009" duration="1026000" />
+      <workItem from="1566891563975" duration="284000" />
+      <workItem from="1566893107340" duration="3382000" />
+      <workItem from="1566953794976" duration="11039000" />
+      <workItem from="1567059357700" duration="484000" />
+      <workItem from="1567082835097" duration="1086000" />
+      <workItem from="1567126428020" duration="1539000" />
+      <workItem from="1567129277820" duration="5788000" />
+      <workItem from="1567136008996" duration="2568000" />
+      <workItem from="1567237040302" duration="111000" />
+      <workItem from="1567495626345" duration="2797000" />
+      <workItem from="1567558770152" duration="2352000" />
+      <workItem from="1567577368149" duration="640000" />
+      <workItem from="1567751224608" duration="780000" />
+      <workItem from="1568019299799" duration="695000" />
+      <workItem from="1568082566133" duration="4016000" />
     </task>
     <task id="LOCAL-00001" summary="修改无数据提示信息">
       <created>1564361618083</created>
@@ -493,17 +560,60 @@
       <option name="project" value="LOCAL" />
       <updated>1566553388171</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="整理管线部分">
+      <created>1566620046627</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1566620046627</updated>
+    </task>
+    <task id="LOCAL-00007" summary="合并代码提交">
+      <created>1566781001910</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1566781001910</updated>
+    </task>
+    <task id="LOCAL-00008" summary="合并代码提交">
+      <created>1566963831930</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1566963831930</updated>
+    </task>
+    <task id="LOCAL-00009" summary="修改报警阈值">
+      <created>1566972146710</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1566972146710</updated>
+    </task>
+    <task id="LOCAL-00010" summary="修改巡检维护表字段">
+      <created>1567126525554</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1567126525554</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="142930000" />
+    <option name="totallyTimeSpent" value="189883000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
+    <frame x="1358" y="-8" width="1456" height="916" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22995462" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29297996" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -511,13 +621,14 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Thumbnails" weight="0.3295082" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.5081967" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.3849105" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
       <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
       <window_info anchor="bottom" id="Spring" order="8" />
       <window_info anchor="bottom" id="Terminal" order="9" />
@@ -539,7 +650,7 @@
       <window_info anchor="right" id="Bean Validation" order="9" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2193646" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2708018" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -547,22 +658,23 @@
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Web" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.47540984" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3276923" />
-      <window_info anchor="bottom" id="Spring" order="8" />
-      <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
-      <window_info anchor="bottom" id="Statistic" order="11" />
-      <window_info anchor="bottom" id="Java Enterprise" order="12" />
-      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="14" weight="0.32786885" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.52307695" />
+      <window_info anchor="bottom" id="Thumbnails" order="0" weight="0.3295082" />
+      <window_info anchor="bottom" id="Message" order="1" />
+      <window_info anchor="bottom" id="Find" order="2" />
+      <window_info anchor="bottom" id="Run" order="3" />
+      <window_info anchor="bottom" id="Debug" order="4" sideWeight="0.49924356" weight="0.49344262" />
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Application Servers" order="8" weight="0.3276923" />
+      <window_info anchor="bottom" id="Spring" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50075644" side_tool="true" weight="0.78615385" />
+      <window_info anchor="bottom" id="Statistic" order="12" />
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <window_info anchor="bottom" id="Database Changes" order="14" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="15" weight="0.32786885" />
+      <window_info anchor="bottom" id="Messages" order="16" weight="0.5229508" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -578,6 +690,16 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -587,7 +709,11 @@
     <MESSAGE value="修改权限问题" />
     <MESSAGE value="修改人员登录返回接口" />
     <MESSAGE value="修改报警统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改报警统计" />
+    <MESSAGE value="整理管线部分" />
+    <MESSAGE value="合并代码提交" />
+    <MESSAGE value="修改报警阈值" />
+    <MESSAGE value="修改巡检维护表字段" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护表字段" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -602,322 +728,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-532">
-          <caret line="50" column="28" lean-forward="true" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="19" column="60" selection-start-line="19" selection-start-column="60" selection-end-line="19" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="100" column="34" lean-forward="true" selection-start-line="100" selection-start-column="34" selection-end-line="100" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1474">
-          <caret line="84" column="58" selection-start-line="84" selection-start-column="58" selection-end-line="84" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1100">
-          <caret line="58" column="18" selection-start-line="58" selection-start-column="18" selection-end-line="58" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6842">
-          <caret line="329" selection-start-line="329" selection-end-line="329" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="102" column="24" lean-forward="true" selection-start-line="102" selection-start-column="24" selection-end-line="102" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="72" column="56" lean-forward="true" selection-start-line="72" selection-start-column="56" selection-end-line="72" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="90" column="39" lean-forward="true" selection-start-line="90" selection-start-column="39" selection-end-line="90" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="97" column="16" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstructionType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
-          <caret line="14" column="52" lean-forward="true" selection-start-line="14" selection-start-column="52" selection-end-line="14" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="24" column="31" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="26" column="34" lean-forward="true" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="61" column="1" lean-forward="true" selection-start-line="61" selection-start-column="1" selection-end-line="61" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="208" column="49" lean-forward="true" selection-start-line="208" selection-start-column="49" selection-end-line="208" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="140" column="57" selection-start-line="140" selection-start-column="57" selection-end-line="140" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="111" column="36" selection-start-line="111" selection-start-column="36" selection-end-line="111" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="3" lean-forward="true" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="81" column="58" lean-forward="true" selection-start-line="81" selection-start-column="58" selection-end-line="81" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="472">
-          <caret line="118" column="59" selection-start-line="118" selection-start-column="59" selection-end-line="118" selection-end-column="59" />
-          <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-198">
-          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="69" column="32" lean-forward="true" selection-start-line="69" selection-start-column="32" selection-end-line="70" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="142" column="59" lean-forward="true" selection-start-line="142" selection-start-column="59" selection-end-line="142" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="349" column="9" lean-forward="true" selection-start-line="349" selection-start-column="9" selection-end-line="349" selection-end-column="9" />
-          <folding>
-            <element signature="method#getConstructionToday#0;class#PgConstructionRs#0" />
-            <element signature="e#12105#12121#0" expanded="true" />
-            <element signature="method#getConstruction#0;class#PgConstructionRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-686">
-          <caret line="67" column="31" lean-forward="true" selection-start-line="67" selection-start-column="31" selection-end-line="67" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="93" column="24" lean-forward="true" selection-start-line="93" selection-start-column="24" selection-end-line="93" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="57" column="23" lean-forward="true" selection-start-line="57" selection-start-column="23" selection-end-line="57" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-408">
-          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="98" column="40" lean-forward="true" selection-start-line="98" selection-start-column="40" selection-end-line="98" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="572">
@@ -925,13 +735,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="328" column="32" lean-forward="true" selection-start-line="328" selection-start-column="32" selection-end-line="328" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
@@ -950,16 +753,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="396">
           <caret line="23" column="32" lean-forward="true" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
-          <folding>
-            <element signature="e#2635#2636#0" expanded="true" />
-            <element signature="e#2671#2672#0" expanded="true" />
-            <element signature="e#2727#2728#0" expanded="true" />
-            <element signature="e#2777#2778#0" expanded="true" />
-            <element signature="e#2877#2878#0" expanded="true" />
-            <element signature="e#2911#2912#0" expanded="true" />
-            <element signature="e#2963#2964#0" expanded="true" />
-            <element signature="e#3009#3010#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -972,14 +765,481 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+        <state relative-caret-position="66">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1012">
+          <caret line="59" column="46" lean-forward="true" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3586">
+          <caret line="179" column="16" selection-start-line="179" selection-start-column="16" selection-end-line="179" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5478">
+          <caret line="273" column="3" selection-start-line="273" selection-start-column="3" selection-end-line="273" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1870">
+          <caret line="147" column="11" selection-start-line="147" selection-start-column="11" selection-end-line="147" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="55" column="15" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="106">
+          <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="290" column="41" lean-forward="true" selection-start-line="290" selection-start-column="41" selection-end-line="290" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="29" column="46" lean-forward="true" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="21" column="32" lean-forward="true" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="550">
+          <caret line="38" column="89" selection-start-line="38" selection-start-column="89" selection-end-line="38" selection-end-column="89" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="11" column="28" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1166">
+          <caret line="87" column="52" selection-start-line="87" selection-start-column="52" selection-end-line="87" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="818">
+          <caret line="285" column="13" lean-forward="true" selection-start-line="285" selection-start-column="13" selection-end-line="285" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="129" column="31" lean-forward="true" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="323" column="72" lean-forward="true" selection-start-line="323" selection-start-column="72" selection-end-line="323" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="44" column="13" lean-forward="true" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-638">
+          <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="244">
+          <caret line="69" column="34" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="157">
+          <caret line="16" column="55" lean-forward="true" selection-start-line="16" selection-start-column="55" selection-end-line="16" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="270" column="33" lean-forward="true" selection-start-line="270" selection-start-column="33" selection-end-line="270" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="490">
+          <caret line="141" selection-start-line="141" selection-end-line="141" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="164" column="5" lean-forward="true" selection-start-line="164" selection-start-column="5" selection-end-line="164" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/apiTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-242">
+          <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="61" column="16" lean-forward="true" selection-start-line="61" selection-start-column="16" selection-end-line="61" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="700">
+          <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="12" column="34" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="39" column="9" lean-forward="true" selection-start-line="39" selection-start-column="9" selection-end-line="39" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="32" column="29" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="29" />
           <folding>
-            <element signature="method#addIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelLineType#0;class#PgIntelPlanRs#0" />
-            <element signature="method#getIntelPlan#0;class#PgIntelPlanRs#0" />
-            <element signature="method#addLineUse#0;class#PgIntelPlanRs#0" />
-            <element signature="method#removeIntelPlan#0;class#PgIntelPlanRs#0" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#1838#1839#0" expanded="true" />
+            <element signature="e#1863#1864#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1925#1926#0" expanded="true" />
+            <element signature="e#1822#1823#0" expanded="true" />
+            <element signature="e#1851#1852#0" expanded="true" />
+            <element signature="e#1895#1896#0" expanded="true" />
+            <element signature="e#1931#1932#0" expanded="true" />
+            <element signature="e#2132#2133#0" expanded="true" />
+            <element signature="e#2164#2165#0" expanded="true" />
+            <element signature="e#2214#2215#0" expanded="true" />
+            <element signature="e#2256#2257#0" expanded="true" />
+            <element signature="e#2330#2331#0" expanded="true" />
+            <element signature="e#2370#2371#0" expanded="true" />
+            <element signature="e#2436#2437#0" expanded="true" />
+            <element signature="e#2494#2495#0" expanded="true" />
+            <element signature="e#2569#2570#0" expanded="true" />
+            <element signature="e#2602#2603#0" expanded="true" />
+            <element signature="e#2654#2655#0" expanded="true" />
+            <element signature="e#2698#2699#0" expanded="true" />
+            <element signature="e#2764#2765#0" expanded="true" />
+            <element signature="e#2795#2796#0" expanded="true" />
+            <element signature="e#2843#2844#0" expanded="true" />
+            <element signature="e#2883#2884#0" expanded="true" />
+            <element signature="e#2948#2949#0" expanded="true" />
+            <element signature="e#2980#2981#0" expanded="true" />
+            <element signature="e#3030#3031#0" expanded="true" />
+            <element signature="e#3072#3073#0" expanded="true" />
+            <element signature="e#3134#3135#0" expanded="true" />
+            <element signature="e#3162#3163#0" expanded="true" />
+            <element signature="e#3204#3205#0" expanded="true" />
+            <element signature="e#3238#3239#0" expanded="true" />
+            <element signature="e#3307#3308#0" expanded="true" />
+            <element signature="e#3346#3347#0" expanded="true" />
+            <element signature="e#3410#3411#0" expanded="true" />
+            <element signature="e#3466#3467#0" expanded="true" />
+            <element signature="e#3537#3538#0" expanded="true" />
+            <element signature="e#3567#3568#0" expanded="true" />
+            <element signature="e#3613#3614#0" expanded="true" />
+            <element signature="e#3651#3652#0" expanded="true" />
+            <element signature="e#3721#3722#0" expanded="true" />
+            <element signature="e#3759#3760#0" expanded="true" />
+            <element signature="e#3821#3822#0" expanded="true" />
+            <element signature="e#3875#3876#0" expanded="true" />
+            <element signature="e#3953#3954#0" expanded="true" />
+            <element signature="e#3991#3992#0" expanded="true" />
+            <element signature="e#4053#4054#0" expanded="true" />
+            <element signature="e#4107#4108#0" expanded="true" />
+            <element signature="e#4186#4187#0" expanded="true" />
+            <element signature="e#4225#4226#0" expanded="true" />
+            <element signature="e#4289#4290#0" expanded="true" />
+            <element signature="e#4345#4346#0" expanded="true" />
+            <element signature="e#4430#4431#0" expanded="true" />
+            <element signature="e#4474#4475#0" expanded="true" />
+            <element signature="e#4698#4699#0" expanded="true" />
+            <element signature="e#4740#4741#0" expanded="true" />
+            <element signature="e#4810#4811#0" expanded="true" />
+            <element signature="e#4872#4873#0" expanded="true" />
+            <element signature="e#4955#4956#0" expanded="true" />
+            <element signature="e#4994#4995#0" expanded="true" />
+            <element signature="e#5058#5059#0" expanded="true" />
+            <element signature="e#5114#5115#0" expanded="true" />
+            <element signature="e#5194#5195#0" expanded="true" />
+            <element signature="e#5233#5234#0" expanded="true" />
+            <element signature="e#5297#5298#0" expanded="true" />
+            <element signature="e#5353#5354#0" expanded="true" />
+            <element signature="e#5428#5429#0" expanded="true" />
+            <element signature="e#5462#5463#0" expanded="true" />
+            <element signature="e#5516#5517#0" expanded="true" />
+            <element signature="e#5562#5563#0" expanded="true" />
+            <element signature="e#5634#5635#0" expanded="true" />
+            <element signature="e#5670#5671#0" expanded="true" />
+            <element signature="e#5728#5729#0" expanded="true" />
+            <element signature="e#5778#5779#0" expanded="true" />
+            <element signature="e#5852#5853#0" expanded="true" />
+            <element signature="e#5888#5889#0" expanded="true" />
+            <element signature="e#5946#5947#0" expanded="true" />
+            <element signature="e#5996#5997#0" expanded="true" />
+            <element signature="e#6067#6068#0" expanded="true" />
+            <element signature="e#6100#6101#0" expanded="true" />
+            <element signature="e#6152#6153#0" expanded="true" />
+            <element signature="e#6196#6197#0" expanded="true" />
+            <element signature="e#6261#6262#0" expanded="true" />
+            <element signature="e#6291#6292#0" expanded="true" />
+            <element signature="e#6337#6338#0" expanded="true" />
+            <element signature="e#6375#6376#0" expanded="true" />
+            <element signature="e#6437#6438#0" expanded="true" />
+            <element signature="e#6467#6468#0" expanded="true" />
+            <element signature="e#6513#6514#0" expanded="true" />
+            <element signature="e#6551#6552#0" expanded="true" />
+            <element signature="e#6613#6614#0" expanded="true" />
+            <element signature="e#6643#6644#0" expanded="true" />
+            <element signature="e#6689#6690#0" expanded="true" />
+            <element signature="e#6727#6728#0" expanded="true" />
+            <element signature="e#6796#6797#0" expanded="true" />
+            <element signature="e#6829#6830#0" expanded="true" />
+            <element signature="e#6881#6882#0" expanded="true" />
+            <element signature="e#6925#6926#0" expanded="true" />
+            <element signature="e#6995#6996#0" expanded="true" />
+            <element signature="e#7030#7031#0" expanded="true" />
+            <element signature="e#7086#7087#0" expanded="true" />
+            <element signature="e#7134#7135#0" expanded="true" />
+            <element signature="e#7202#7203#0" expanded="true" />
+            <element signature="e#7233#7234#0" expanded="true" />
+            <element signature="e#7281#7282#0" expanded="true" />
+            <element signature="e#7321#7322#0" expanded="true" />
+            <element signature="e#7390#7391#0" expanded="true" />
+            <element signature="e#7426#7427#0" expanded="true" />
+            <element signature="e#7484#7485#0" expanded="true" />
+            <element signature="e#7534#7535#0" expanded="true" />
+            <element signature="e#7602#7603#0" expanded="true" />
+            <element signature="e#7636#7637#0" expanded="true" />
+            <element signature="e#7690#7691#0" expanded="true" />
+            <element signature="e#7736#7737#0" expanded="true" />
+            <element signature="e#7806#7807#0" expanded="true" />
+            <element signature="e#7840#7841#0" expanded="true" />
+            <element signature="e#7894#7895#0" expanded="true" />
+            <element signature="e#7940#7941#0" expanded="true" />
+            <element signature="e#8006#8007#0" expanded="true" />
+            <element signature="e#8036#8037#0" expanded="true" />
+            <element signature="e#8082#8083#0" expanded="true" />
+            <element signature="e#8120#8121#0" expanded="true" />
+            <element signature="e#8189#8190#0" expanded="true" />
+            <element signature="e#8226#8227#0" expanded="true" />
+            <element signature="e#8286#8287#0" expanded="true" />
+            <element signature="e#8338#8339#0" expanded="true" />
+            <element signature="e#8417#8418#0" expanded="true" />
+            <element signature="e#8457#8458#0" expanded="true" />
+            <element signature="e#8523#8524#0" expanded="true" />
+            <element signature="e#8581#8582#0" expanded="true" />
+            <element signature="e#8655#8656#0" expanded="true" />
+            <element signature="e#8687#8688#0" expanded="true" />
+            <element signature="e#8737#8738#0" expanded="true" />
+            <element signature="e#8779#8780#0" expanded="true" />
+            <element signature="e#8846#8847#0" expanded="true" />
+            <element signature="e#8879#8880#0" expanded="true" />
+            <element signature="e#8931#8932#0" expanded="true" />
+            <element signature="e#8975#8976#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#787#788#0" expanded="true" />
+            <element signature="e#817#818#0" expanded="true" />
+            <element signature="e#2105#2106#0" expanded="true" />
+            <element signature="e#2135#2136#0" expanded="true" />
+            <element signature="e#2431#2432#0" expanded="true" />
+            <element signature="e#2461#2462#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index 854f1f1..0db633a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -165,12 +165,16 @@
     }
 
     //获取历史报警消息列表
-    public List<PgAlarmDto> getAllAlarm(String startDay,String endDay) {
+    public List<PgAlarmDto> getAllAlarm(String alarmType,String startDay,String endDay,String isNew) {
         try {
 
             Criteria criteria = createCriteria(PgAlarm.class);
             criteria.addOrder(Order.desc("id"));
 
+            if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) {
+                criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
+            }
+
             if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay))
             {
                 criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay)));
@@ -193,9 +197,11 @@
 
                 criteria.add(Restrictions.le("alarmDate",date));
             }
+            if(StringUtils.isNotBlank(isNew)&&isNew.equals("true"))
+                criteria.add(Restrictions.eq("active", 1));
 
             List<PgAlarm> pgAlarmList = criteria.list();
-            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
+            List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
             for (PgAlarm pgAlarm : pgAlarmList) {
                 pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
             }
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
     }
 
     //根据设备位置(仓位)获取摄像机列表
-    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+    public List<PgDeviceDto> getPgCameraListByPosition(String partition,String position){
         Criteria criteria=createCriteria(PgDevice.class);
-        criteria.add(Restrictions.like("position",position+"%"));
-//        criteria.add(Restrictions.eq("devType","球机"));
+        if(StringUtils.isNotBlank(partition))
+            criteria.add(Restrictions.eq("partition",partition));
+        if(StringUtils.isNotBlank(position))
+            criteria.add(Restrictions.like("position",position+"%"));
+
         criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
 
         List<PgDevice> pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
             dto.setDevCode(objects[5].toString());
             dto.setDevType(objects[6].toString());
             if(objects[7]!=null)
-            dto.setIp(objects[7].toString());
+                dto.setIp(objects[7].toString());
             dto.setIsOpen(objects[8].toString());
             dto.setPartition(objects[11].toString());
             dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index 8ebf74d..3c657a7 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgEquipment;
 import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
 import com.casic.PgInterface.devTable.dto.PgEquipmentDto;
@@ -34,9 +35,12 @@
     public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
-        criteria.add(Restrictions.eq("eqName",eqName));
-        criteria.add(Restrictions.eq("eqCode",eqCode));
-        criteria.add(Restrictions.eq("eqType",eqType));
+        if(StringUtils.isNotBlank(eqName))
+            criteria.add(Restrictions.eq("eqName",eqName));
+        if(StringUtils.isNotBlank(eqCode))
+            criteria.add(Restrictions.eq("eqCode",eqCode));
+        if(StringUtils.isNotBlank(eqType))
+            criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
@@ -51,10 +55,9 @@
 
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
-        //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
         String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
-        +eqType+"' group by equipment.EQ_NAME";
+                +eqType+"' group by equipment.EQ_NAME";
 
         List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4ed68e4..e413a5c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.devTable.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
@@ -39,7 +40,8 @@
 
     public List<PgPipeLineDto> getPipeLineByLineType(String lineType) {
         Criteria criteria = createCriteria(PgPipeLine.class);
-        criteria.add(Restrictions.eq("lineType", lineType));
+        if(StringUtils.isNotBlank(lineType))
+            criteria.add(Restrictions.eq("lineType", lineType));
 
         List<PgPipeLine> pgPipeLineList = criteria.list();
         List<PgPipeLineDto> pgPipeLineDtoList = new ArrayList<>();
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    private Long id;
-    private String keyId;//巡检记录单id
-    private String planId;//巡检计划ID
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    @Column(name="KEY_ID")
-    public String getKeyId() {
-        return keyId;
-    }
-
-    public void setKeyId(String keyId) {
-        this.keyId = keyId;
-    }
-
-    @Column(name="PLAN_ID")
-    public String getPlanId() {
-        return planId;
-    }
-
-    public void setPlanId(String planId) {
-        this.planId = planId;
-    }
-
-    @Column(name="CREATE_DATE")
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    @Column(name="STATE")
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    @Column(name="CREATOR")
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    @Column(name="PLAN_NAME")
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    @Column(name="RECORD_NO")
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    @Column(name="PLAN_NO")
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    @Column(name="RESPONSIBIE_DEPT")
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    @Column(name="INSPECTION_PERSON")
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    @Column(name="PATROL_MAN")
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    @Column(name="OPERATE_DATE")
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    @Column(name="REMARK")
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Column(name="BUILD_CABIN")
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    @Column(name="PROJECT")
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    @Column(name="START_PILE_NO")
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    @Column(name="END_PILE_NO")
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    @Column(name="INSPECTION_PRACE")
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    @Column(name="OTHER_PATROL_MAN")
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private Long id;
+    private String KEY_ID;//唯一键值
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_PERSON;//巡检人
+    private String START_DATE;//巡检开始时间
+    private String END_DATE;
+    private String FREQUENCY;//巡检频率
+    private String STATE;//状态
+    private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+    private String PLAN_NO;//巡检计划编号
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_MODE;//巡检方式
+    private String INSPECTION_ROUTE;//巡检路线
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String INSPECTION_GROUP;//巡检部门
+    private String INSERT_TIME;//插入时间
+    private String FREQUENCYDATE;//巡检具体日期
+    private String FREQUENCYTIME;//巡检具体时间
+    private String CREATEDATE;//创建时间
+    private String CREATOR;//创建人
+    private String PROJECT;//项目
+    private String COMLILE;//编制人
+    private String START_TIME;//编制时间
+    private String DEVELOP_DEPT;//制定部门
+    private String END_TIME;//结束时间
+    private String START_PILE_NO;//开始桩号
+    private String END_PILE_NO;//结束桩号
+    private String BUILD_CABIN;//巡检舱室
+    private String MILEAGE;
+    private String FREQUENCY_TIME;//巡检具体时间
+    private String FREQUENCYTIME_END;
+    private String KETTLE_TS;
+    private String UPDATEDATE;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="KEY_ID")
+    public String getKEY_ID() {
+        return KEY_ID;
+    }
+
+    public void setKEY_ID(String KEY_ID) {
+        this.KEY_ID = KEY_ID;
+    }
+
+    @Column(name="PLAN_NAME")
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    @Column(name="INSPECTION_PERSON")
+    public String getINSPECTION_PERSON() {
+        return INSPECTION_PERSON;
+    }
+
+    public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+        this.INSPECTION_PERSON = INSPECTION_PERSON;
+    }
+
+    @Column(name="START_DATE")
+    public String getSTART_DATE() {
+        return START_DATE;
+    }
+
+    public void setSTART_DATE(String START_DATE) {
+        this.START_DATE = START_DATE;
+    }
+
+    @Column(name="END_DATE")
+    public String getEND_DATE() {
+        return END_DATE;
+    }
+
+    public void setEND_DATE(String END_DATE) {
+        this.END_DATE = END_DATE;
+    }
+
+    @Column(name="FREQUENCY")
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    @Column(name="STATE")
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    @Column(name="RESPONSIBLE_DEPT")
+    public String getRESPONSIBLE_DEPT() {
+        return RESPONSIBLE_DEPT;
+    }
+
+    public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+        this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+    }
+
+    @Column(name="PLAN_NO")
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    @Column(name="INSPECTION_TYPE")
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    @Column(name="INSPECTION_MODE")
+    public String getINSPECTION_MODE() {
+        return INSPECTION_MODE;
+    }
+
+    public void setINSPECTION_MODE(String INSPECTION_MODE) {
+        this.INSPECTION_MODE = INSPECTION_MODE;
+    }
+
+    @Column(name="INSPECTION_ROUTE")
+    public String getINSPECTION_ROUTE() {
+        return INSPECTION_ROUTE;
+    }
+
+    public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+        this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+    }
+
+    @Column(name="INSPECTION_START_TIME")
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    @Column(name="INSPECTION_END_TIME")
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    @Column(name="INSPECTION_PRACE")
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    @Column(name="INSPECTION_GROUP")
+    public String getINSPECTION_GROUP() {
+        return INSPECTION_GROUP;
+    }
+
+    public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+        this.INSPECTION_GROUP = INSPECTION_GROUP;
+    }
+
+    @Column(name="INSERT_TIME")
+    public String getINSERT_TIME() {
+        return INSERT_TIME;
+    }
+
+    public void setINSERT_TIME(String INSERT_TIME) {
+        this.INSERT_TIME = INSERT_TIME;
+    }
+
+    @Column(name="FREQUENCYDATE")
+    public String getFREQUENCYDATE() {
+        return FREQUENCYDATE;
+    }
+
+    public void setFREQUENCYDATE(String FREQUENCYDATE) {
+        this.FREQUENCYDATE = FREQUENCYDATE;
+    }
+
+    @Column(name="FREQUENCYTIME")
+    public String getFREQUENCYTIME() {
+        return FREQUENCYTIME;
+    }
+
+    public void setFREQUENCYTIME(String FREQUENCYTIME) {
+        this.FREQUENCYTIME = FREQUENCYTIME;
+    }
+
+    @Column(name="CREATEDATE")
+    public String getCREATEDATE() {
+        return CREATEDATE;
+    }
+
+    public void setCREATEDATE(String CREATEDATE) {
+        this.CREATEDATE = CREATEDATE;
+    }
+
+    @Column(name="CREATOR")
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    @Column(name="PROJECT")
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    @Column(name="COMLILE")
+    public String getCOMLILE() {
+        return COMLILE;
+    }
+
+    public void setCOMLILE(String COMLILE) {
+        this.COMLILE = COMLILE;
+    }
+
+    @Column(name="START_TIME")
+    public String getSTART_TIME() {
+        return START_TIME;
+    }
+
+    public void setSTART_TIME(String START_TIME) {
+        this.START_TIME = START_TIME;
+    }
+
+    @Column(name="DEVELOP_DEPT")
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    @Column(name="END_TIME")
+    public String getEND_TIME() {
+        return END_TIME;
+    }
+
+    public void setEND_TIME(String END_TIME) {
+        this.END_TIME = END_TIME;
+    }
+
+    @Column(name="START_PILE_NO")
+    public String getSTART_PILE_NO() {
+        return START_PILE_NO;
+    }
+
+    public void setSTART_PILE_NO(String START_PILE_NO) {
+        this.START_PILE_NO = START_PILE_NO;
+    }
+
+    @Column(name="END_PILE_NO")
+    public String getEND_PILE_NO() {
+        return END_PILE_NO;
+    }
+
+    public void setEND_PILE_NO(String END_PILE_NO) {
+        this.END_PILE_NO = END_PILE_NO;
+    }
+
+    @Column(name="BUILD_CABIN")
+    public String getBUILD_CABIN() {
+        return BUILD_CABIN;
+    }
+
+    public void setBUILD_CABIN(String BUILD_CABIN) {
+        this.BUILD_CABIN = BUILD_CABIN;
+    }
+
+    @Column(name="MILEAGE")
+    public String getMILEAGE() {
+        return MILEAGE;
+    }
+
+    public void setMILEAGE(String MILEAGE) {
+        this.MILEAGE = MILEAGE;
+    }
+
+    @Column(name="FREQUENCY_TIME")
+    public String getFREQUENCY_TIME() {
+        return FREQUENCY_TIME;
+    }
+
+    public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+        this.FREQUENCY_TIME = FREQUENCY_TIME;
+    }
+
+    @Column(name="FREQUENCYTIME_END")
+    public String getFREQUENCYTIME_END() {
+        return FREQUENCYTIME_END;
+    }
+
+    public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+        this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+    }
+
+    @Column(name="KETTLE_TS")
+    public String getKETTLE_TS() {
+        return KETTLE_TS;
+    }
+
+    public void setKETTLE_TS(String KETTLE_TS) {
+        this.KETTLE_TS = KETTLE_TS;
+    }
+
+    @Column(name="UPDATEDATE")
+    public String getUPDATEDATE() {
+        return UPDATEDATE;
+    }
+
+    public void setUPDATEDATE(String UPDATEDATE) {
+        this.UPDATEDATE = UPDATEDATE;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 5346b57..2f8d359 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -66,7 +66,7 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REPAIRMAN")
+    @Column(name="REOAIRMAN")
     public String getRepairMan() {
         return repairMan;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
-    private Long id;
-    private String createDate;//创建时间
-    private String state;//巡检记录状态
-    private String creator;//创建人
-    private String planName;//计划名称
-    private String recordNo;//记录单号
-    private String planNo;//巡检计划编号
-    private String responsibleDept;//负责单位部门小组
-    private String inspectionPerson;//计划巡检人
-    private String patrolMan;//巡检人
-    private String operateDate;//计划巡检日期
-    private String remark;//巡检记录
-    private String buildCabin;//舱室
-    private String project;//所属项目
-    private String startPileNo;//开始桩号
-    private String endPileNo;//结束桩号
-    private String inspectionPrace;//巡检地点
-    private String otherPatrolMan;//其他巡检人
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getPlanName() {
-        return planName;
-    }
-
-    public void setPlanName(String planName) {
-        this.planName = planName;
-    }
-
-    public String getRecordNo() {
-        return recordNo;
-    }
-
-    public void setRecordNo(String recordNo) {
-        this.recordNo = recordNo;
-    }
-
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo;
-    }
-
-    public String getResponsibleDept() {
-        return responsibleDept;
-    }
-
-    public void setResponsibleDept(String responsibleDept) {
-        this.responsibleDept = responsibleDept;
-    }
-
-    public String getInspectionPerson() {
-        return inspectionPerson;
-    }
-
-    public void setInspectionPerson(String inspectionPerson) {
-        this.inspectionPerson = inspectionPerson;
-    }
-
-    public String getPatrolMan() {
-        return patrolMan;
-    }
-
-    public void setPatrolMan(String patrolMan) {
-        this.patrolMan = patrolMan;
-    }
-
-    public String getOperateDate() {
-        return operateDate;
-    }
-
-    public void setOperateDate(String operateDate) {
-        this.operateDate = operateDate;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getBuildCabin() {
-        return buildCabin;
-    }
-
-    public void setBuildCabin(String buildCabin) {
-        this.buildCabin = buildCabin;
-    }
-
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    public String getStartPileNo() {
-        return startPileNo;
-    }
-
-    public void setStartPileNo(String startPileNo) {
-        this.startPileNo = startPileNo;
-    }
-
-    public String getEndPileNo() {
-        return endPileNo;
-    }
-
-    public void setEndPileNo(String endPileNo) {
-        this.endPileNo = endPileNo;
-    }
-
-    public String getInspectionPrace() {
-        return inspectionPrace;
-    }
-
-    public void setInspectionPrace(String inspectionPrace) {
-        this.inspectionPrace = inspectionPrace;
-    }
-
-    public String getOtherPatrolMan() {
-        return otherPatrolMan;
-    }
-
-    public void setOtherPatrolMan(String otherPatrolMan) {
-        this.otherPatrolMan = otherPatrolMan;
-    }
-
-
-    public static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
-        PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
-        pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
-        pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
-        pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
-        pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
-        pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
-        pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
-        pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
-        pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
-        pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
-        pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
-        pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
-        pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
-        pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
-        pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
-        pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
-        pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
-        return pgAssetInSpectionRecordDto;
-    }
-
-
-    public static List<PgAssetInSpectionRecordDto> ConvertToDtoList(List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList){
-        List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-        for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
-            pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
-        }
-
-        return pgAssetInSpectionRecordDtoList;
-    }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
-    private String num;
-    private String createDate;
-
-    public String getNum() {
-        return num;
-    }
-
-    public void setNum(String num) {
-        this.num = num;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+    private Long id;
+    private String PLAN_NO;//巡检计划编号
+    private String PLAN_NAME;//巡检计划名称
+    private String INSPECTION_TYPE;//巡检类型
+    private String INSPECTION_START_TIME;//巡检开始时间
+    private String INSPECTION_END_TIME;//巡检结束时间
+    private String INSPECTION_PRACE;//巡检地点
+    private String FREQUENCY;//巡检频率
+    private String CREATOR;//创建人
+    private String DEVELOP_DEPT;//制定部门
+    private String PROJECT;//项目
+    private String STATE;//状态
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPLAN_NO() {
+        return PLAN_NO;
+    }
+
+    public void setPLAN_NO(String PLAN_NO) {
+        this.PLAN_NO = PLAN_NO;
+    }
+
+    public String getPLAN_NAME() {
+        return PLAN_NAME;
+    }
+
+    public void setPLAN_NAME(String PLAN_NAME) {
+        this.PLAN_NAME = PLAN_NAME;
+    }
+
+    public String getINSPECTION_TYPE() {
+        return INSPECTION_TYPE;
+    }
+
+    public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+        this.INSPECTION_TYPE = INSPECTION_TYPE;
+    }
+
+    public String getINSPECTION_START_TIME() {
+        return INSPECTION_START_TIME;
+    }
+
+    public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+        this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+    }
+
+    public String getINSPECTION_END_TIME() {
+        return INSPECTION_END_TIME;
+    }
+
+    public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+        this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+    }
+
+    public String getINSPECTION_PRACE() {
+        return INSPECTION_PRACE;
+    }
+
+    public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+        this.INSPECTION_PRACE = INSPECTION_PRACE;
+    }
+
+    public String getFREQUENCY() {
+        return FREQUENCY;
+    }
+
+    public void setFREQUENCY(String FREQUENCY) {
+        this.FREQUENCY = FREQUENCY;
+    }
+
+    public String getCREATOR() {
+        return CREATOR;
+    }
+
+    public void setCREATOR(String CREATOR) {
+        this.CREATOR = CREATOR;
+    }
+
+    public String getDEVELOP_DEPT() {
+        return DEVELOP_DEPT;
+    }
+
+    public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+        this.DEVELOP_DEPT = DEVELOP_DEPT;
+    }
+
+    public String getPROJECT() {
+        return PROJECT;
+    }
+
+    public void setPROJECT(String PROJECT) {
+        this.PROJECT = PROJECT;
+    }
+
+    public String getSTATE() {
+        return STATE;
+    }
+
+    public void setSTATE(String STATE) {
+        this.STATE = STATE;
+    }
+
+    public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+        PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+        pgAssetPlanDto.setId(pgAssetPlan.getId());
+        pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+        pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+        pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+        pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+        pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+        pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+        pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+        pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+        pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+        pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+        pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+        return pgAssetPlanDto;
+    }
+
+    public static List<PgAssetPlanDto> ConvertToPgAssetDtoList(List<PgAssetPlan> pgAssetPlanList){
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
+
+        for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+            pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+        }
+
+        return pgAssetPlanDtoList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
new file mode 100644
index 0000000..bc12db1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
@@ -0,0 +1,24 @@
+package com.casic.PgInterface.maintenance.dto;
+
+public class PgAssetPlanStatic {
+
+    private String num;
+    private String createDate;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
deleted file mode 100644
index c41ca7d..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.casic.PgInterface.maintenance.manager;
-
-import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
-
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
-        try {
-            String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
-                    "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
-                    "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-
-            if(patrolMan!=null)
-                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
-            if(startTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
-            if(endTime!=null)
-                sql+=" and to_date(create_date,'yyyy-MM-dd')<to_date('"+endTime+"','yyyy-MM-dd')";
-
-            sql+=" order by id";
-
-            List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
-
-            List<PgAssetInSpectionRecord> pgAssetInSpectionRecordList=new ArrayList<>();
-            for(Object[] objects1:objects){
-                PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord();
-
-                pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString()));
-                pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1]));
-                pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2]));
-                pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3]));
-                pgAssetInSpectionRecord.setState(String.valueOf(objects1[4]));
-                pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5]));
-                pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6]));
-                pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7]));
-                pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8]));
-                pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9]));
-                pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10]));
-                pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11]));
-                pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12]));
-                pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13]));
-                pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14]));
-                pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15]));
-                pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16]));
-                pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17]));
-                pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18]));
-                pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19]));
-
-                pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord);
-            }
-
-            List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-            for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList)
-            {
-                pgAssetInSpectionRecordDtoList.add(PgAssetInSpectionRecordDto.ConvertToDto(pgAssetInSpectionRecord));
-            }
-
-            return pgAssetInSpectionRecordDtoList;
-        }
-        catch(Exception e)
-        {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public List<PgAssetInSpectionRecordStatic> getPgAssetInSpectionRecordStaticLisByTime(
-            String startTime, String endTime, String staticType) {
-
-        String sql="";
-        String dateType="";
-        List<PgAssetInSpectionRecordStatic> pgAssetInSpectionRecordStaticList=new ArrayList<>();
-        int type=Integer.valueOf(staticType);
-
-        switch(type) {
-            case 0://年
-                dateType = "yyyy";
-                break;
-            case 1://月
-                dateType = "yyyy-mm";
-                break;
-            case 2://周
-                dateType = "iw";
-                break;
-            case 3://日
-                dateType="yyyy-mm-dd";
-                break;
-            default:
-                break;
-        }
-
-        sql="select count(*), to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_RECORD t where 1=1";
-
-        if(startTime!=null)
-            sql+=" and t.CREATE_DATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
-        if(endTime!=null)
-            sql+=" and t.CREATE_DATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
-
-        sql+=" group by to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"')";
-
-        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
-        for(int i=0;i<objects.size();i++)
-        {
-            PgAssetInSpectionRecordStatic pgAssetInSpectionRecordStatic=new PgAssetInSpectionRecordStatic();
-            pgAssetInSpectionRecordStatic.setNum(objects.get(i)[0].toString());
-            pgAssetInSpectionRecordStatic.setCreateDate(objects.get(i)[1].toString());
-            pgAssetInSpectionRecordStaticList.add(pgAssetInSpectionRecordStatic);
-        }
-        return pgAssetInSpectionRecordStaticList;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
new file mode 100644
index 0000000..bb6bf1e
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java
@@ -0,0 +1,81 @@
+package com.casic.PgInterface.maintenance.manager;
+
+import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PgAssetPlanManager extends HibernateEntityDao<PgAssetPlan> {
+
+    public List<PgAssetPlanDto> getPgAssetPlanDtoList(String inSpectionPlace){
+        Criteria criteria=createCriteria(PgAssetPlan.class);
+
+        if(StringUtils.isNotBlank(inSpectionPlace))
+            criteria.add(Restrictions.like("INSPECTION_PRACE","%"+inSpectionPlace+"%"));
+        criteria.addOrder(Order.desc("id"));
+
+        List<PgAssetPlan> pgAssetPlanList=criteria.list();
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=PgAssetPlanDto.ConvertToPgAssetDtoList(pgAssetPlanList);
+
+        if(pgAssetPlanDtoList==null||pgAssetPlanDtoList.size()==0)
+            return null;
+        else
+            return pgAssetPlanDtoList;
+    }
+
+    public List<PgAssetPlanStatic> getPgAssetPlanStaticLisByTime(
+            String startTime, String endTime, String staticType) {
+
+        String sql="";
+        String dateType="";
+        List<PgAssetPlanStatic> pgAssetPlanStaticList=new ArrayList<>();
+        int type=Integer.valueOf(staticType);
+
+        switch(type) {
+            case 0://年
+                dateType = "yyyy";
+                break;
+            case 1://月
+                dateType = "yyyy-mm";
+                break;
+            case 2://周
+                dateType = "iw";
+                break;
+            case 3://日
+                dateType="yyyy-mm-dd";
+                break;
+            default:
+                break;
+        }
+
+        sql="select count(*), to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_PLAN t where 1=1";
+
+        if(startTime!=null)
+            sql+=" and t.CREATEDATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
+        if(endTime!=null)
+            sql+=" and t.CREATEDATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
+
+        sql+=" group by to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"')";
+
+        List<Object[]> objects = this.getSession().createSQLQuery(sql).list();
+        for(int i=0;i<objects.size();i++)
+        {
+            PgAssetPlanStatic pgAssetPlanStatic=new PgAssetPlanStatic();
+            pgAssetPlanStatic.setNum(objects.get(i)[0].toString());
+            pgAssetPlanStatic.setCreateDate(objects.get(i)[1].toString());
+            pgAssetPlanStaticList.add(pgAssetPlanStatic);
+        }
+        return pgAssetPlanStaticList;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 0903f22..3484739 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -15,7 +15,7 @@
 
     public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
             if(repairMan!=null)
                 sql+=" and REPAIRMAN like '%"+repairMan+"%'";
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index 9cc2881..6d90d7b 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -1,5 +1,7 @@
 package com.casic.PgInterface.patroler.dto;
 
+import com.casic.PgInterface.devTable.domain.PgDevice;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 
 /**
@@ -14,6 +16,7 @@
     private String unit;//单位
     private String alarmType;//报警类型
     private Long pgDeviceId;//设备编号
+    private String assetCode;//资产编号
 
     public Long getId() {
         return id;
@@ -71,7 +74,15 @@
         this.pgDeviceId = pgDeviceId;
     }
 
-    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
+    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule, PgDeviceManager pgDeviceManager) {
         this.setId(pgAlarmRule.getId());
         this.setHighValue(pgAlarmRule.getHighValue());
         this.setLowValue(pgAlarmRule.getLowValue());
@@ -82,6 +93,10 @@
         else
             this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
         this.setPgDeviceId(pgAlarmRule.getPgDeviceId());
+        if(pgAlarmRule.getAlarmTypeId()!=null&&pgDeviceManager.get(pgAlarmRule.getPgDeviceId())!=null)
+            this.setAssetCode(pgDeviceManager.get(pgAlarmRule.getPgDeviceId()).getAssetCode());
+        else
+            this.setAssetCode("");
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
index c132c98..a7cef5b 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
@@ -1,13 +1,17 @@
 package com.casic.PgInterface.patroler.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.ResponseStatus;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -17,30 +21,23 @@
 @Service
 public class PgAlarmRuleManager extends HibernateEntityDao<PgAlarmRule> {
 
+    @Resource
+    private PgDeviceManager pgDeviceManager;
+
     //根据设备获取设备报警阈值
-    public List<PgAlarmRuleDto>  getAlarmRuleDto() {
+    public List<PgAlarmRuleDto>  getAlarmRuleDto(String devType) {
         Criteria criteria=createCriteria(PgAlarmRule.class);
+
+        if(StringUtils.isNotBlank(devType))
+            criteria.add(Restrictions.eq("devType", devType));
         criteria.addOrder(Order.desc("id"));
 
         List<PgAlarmRule> pgAlarmRuleList=criteria.list();
-        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
+        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         for (PgAlarmRule pgAlarmRule : pgAlarmRuleList) {
-            pgAlarmRuleDtoList.add(new PgAlarmRuleDto(pgAlarmRule));
+            pgAlarmRuleDtoList.add(new PgAlarmRuleDto(pgAlarmRule,pgDeviceManager));
         }
         return pgAlarmRuleDtoList;
-
     }
 
-    public PgAlarmRule getAlarmRuleBydevType(String devType) {
-        Criteria criteria=createCriteria(PgAlarmRule.class);
-        criteria.add(Restrictions.eq("devType", devType));
-
-        List<PgAlarmRule> pgAlarmRuleList=criteria.list();
-
-        if(pgAlarmRuleList==null||pgAlarmRuleList.size()==0)
-            return null;
-        else
-            return pgAlarmRuleList.get(0);
-    }
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index d0e28f5..082ba5d 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.core.util.StringUtils;
 import com.casic.PgInterface.devTable.domain.PgAlarm;
 import com.casic.PgInterface.devTable.domain.PgDevice;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
@@ -39,7 +40,7 @@
     private PgReservePlanManager pgReservePlanManager;
 
     /*
-    * 获取报警设备信息
+     * 获取报警设备信息
      */
     @POST
     @Path("linkDevice")
@@ -50,11 +51,22 @@
 
         PgDeviceDto pgDeviceDto = null;
         try {
-            PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
-            PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
-
-            pgDeviceDto=new PgDeviceDto(pgDevice);
-            msg = "报警关联设备获取成功";
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if (pgAlarm == null)
+                    msg = "不存在报警信息";
+                else {
+                    PgDevice pgDevice = pgAlarm.getAlarmDevId();
+                    if (pgDevice == null)
+                        msg = "不存在报警设备";
+                    else {
+                        pgDeviceDto = new PgDeviceDto(pgDevice);
+                        msg = "报警关联设备获取成功";
+                    }
+                }
+            }
+            else
+                msg="未接受到报警设备ID信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "获取关联设备失败";
@@ -77,11 +89,28 @@
 
         List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
-            PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
-            PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
-            pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if(pgAlarm==null)
+                    msg="不存在报警信息";
+                else {
+                    PgDevice pgDevice = pgAlarm.getAlarmDevId();
+                    if (pgDevice == null)
+                        msg = "不存在报警设备";
+                    else {
+                        String strPosition=pgDevice.getPosition();
+                        String position="";
+                        if(!strPosition.equals(""))
+                            position=pgDevice.getPosition().substring(0,3);
+                        String partition=pgDevice.getPartition();
 
-            msg = "关联设备获取成功";
+                        pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
+                        msg = "关联设备获取成功";
+                    }
+                }
+            }
+            else
+                msg="请输入报警设备Id信息";
         } catch (Exception e) {
             e.printStackTrace();
             msg = "分区设备关联失败";
@@ -93,7 +122,7 @@
 
     /*
      * 根据报警记录获取关联的预案
-    */
+     */
     @POST
     @Path("linkReservePlan")
     @Produces(MediaType.APPLICATION_JSON)
@@ -103,10 +132,21 @@
 
         List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
-            PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
-            pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
+            if(StringUtils.isNotBlank(id)) {
+                PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+                if (pgAlarm == null)
+                    msg = "不存在报警信息";
+                else {
+                    pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
 
-            msg="关联预案获取成功";
+                    if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
+                        msg="不存在关联的报警预案";
+                    else
+                        msg = "关联预案获取成功";
+                }
+            }
+            else
+                msg="请输入报警信息";
         }
         catch(Exception e)
         {
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index d18ebb8..baacd93 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -48,14 +48,16 @@
     @POST
     @Path("getAlarmInfo")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmList(@FormParam("startDay") String startDay,
-                                            @FormParam("endDay") String endDay) throws Exception {
+    public Map<String, Object> getAlarmList(@FormParam("alarmType") String alarmType,
+                                            @FormParam("startDay") String startDay,
+                                            @FormParam("endDay") String endDay,
+                                            @FormParam("isNew") String isNew) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
         List<PgAlarmDto> pgAlarmDtoList = new ArrayList<>();
         try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm(startDay,endDay);
-            if (pgAlarmDtoList.size() == 0)
+            pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew);
+            if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0)
                 msg = "没有报警信息";
             else
                 msg = "报警信息获取成功";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 87afd54..29ce8a4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -1,7 +1,5 @@
 package com.casic.PgInterface.rs;
 
-import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager;
-import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import com.casic.PgInterface.patroler.manager.PgAlarmRuleManager;
@@ -30,119 +28,23 @@
     private static Logger logger = LoggerFactory.getLogger(PgAlarmRule.class);
 
     @Resource
-    private PgDeviceManager pgDeviceManager;
-    @Resource
-    private PgAlarmTypeManager pgAlarmTypeManager;
-    @Resource
     private PgAlarmRuleManager pgAlarmRuleManager;
 
-
-
-    /**
-     * 新增报警阈值
-     */
-    @POST
-    @Path("addAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> addAlarmRule(@FormParam("highValue") String highValue,
-                                            @FormParam("lowValue") String lowValue,
-                                            @FormParam("unit") String unit,
-                                            @FormParam("devType") String devType,
-                                            @FormParam("alarmType") String alarmType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType);
-            if (pgAlarmRule != null) {
-                result = "false";
-                msg = "设备阈值已经存在";
-            } else {
-                pgAlarmRule = new PgAlarmRule();
-                pgAlarmRule.setHighValue(highValue);
-                pgAlarmRule.setLowValue(lowValue);
-                pgAlarmRule.setDevType(devType);
-                pgAlarmRule.setUnit(unit);
-                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
-
-                pgAlarmRuleManager.save(pgAlarmRule);
-                result = "true";
-                msg = "报警阈值新增成功";
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            result = "false";
-            msg = "报警阈值新增失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-        return resultMap;
-    }
-
-    /**
-     * 编辑报警阈值
-     */
-    @POST
-    @Path("editAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> editAlarmRule(@FormParam("id") String id,
-                                             @FormParam("devType") String devType,
-                                             @FormParam("highValue") String highValue,
-                                             @FormParam("lowValue") String lowValue,
-                                             @FormParam("unit") String unit,
-                                             @FormParam("alarmType") String alarmType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
-            if (pgAlarmRule == null) {
-                msg = "不存在报警阈值记录";
-                result = "false";
-            } else {
-                pgAlarmRule.setDevType(devType);
-                pgAlarmRule.setHighValue(highValue);
-                pgAlarmRule.setLowValue(lowValue);
-                pgAlarmRule.setUnit(unit);
-                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
-
-                pgAlarmRuleManager.save(pgAlarmRule);
-                msg = "编辑成功";
-                result = "true";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            result = "false";
-            msg = "报警阈值编辑失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-
-        return resultMap;
-    }
-
     /**
      * 获取报警阈值信息
      */
     @POST
     @Path("getAlarmRule")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmRule() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+    public Map<String, Object> getAlarmRule(@FormParam("devType") String devType) throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
+        System.out.println("devType:"+devType);
+        List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<>();
         try {
-            pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto();
-            if (pgAlarmRuleDtoList == null)
+            pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
+            if (pgAlarmRuleDtoList == null||pgAlarmRuleDtoList.size()==0)
                 msg = "不存在报警阈值信息";
             else
                 msg = "报警阈值获取成功";
@@ -155,69 +57,4 @@
         return resultMap;
     }
 
-    /**
-     * 删除报警阈值
-     */
-    @POST
-    @Path("deleteAlarmRule")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> deleteAlarmRule(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "";
-        PgAlarmRule pgAlarmRule = null;
-
-        try {
-            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
-            if (pgAlarmRule == null) {
-                msg = "不存在报警阈值记录";
-                result = "false";
-            } else {
-                pgAlarmRuleManager.remove(pgAlarmRule);
-                msg = "删除成功";
-                result = "true";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            result = "false";
-            msg = "报警阈值删除失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-
-        return resultMap;
-    }
-
-    /**
-     * 根据设备类型报警阈值
-     */
-    @POST
-    @Path("getAlarmRuleByDevType")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmRuleByDevType(@FormParam("devType") String devType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        PgAlarmRule pgAlarmRule = null;
-        List<PgAlarmRuleDto> pgAlarmRuleDtos = new ArrayList<>();
-        try {
-            pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType);
-            if (pgAlarmRule == null)
-                msg = "不存在报警阈值记录";
-            else {
-                PgAlarmRuleDto pgAlarmRuleDto= new PgAlarmRuleDto(pgAlarmRule);
-                pgAlarmRuleDtos.add(pgAlarmRuleDto);
-                msg = "报警阈值获取成功";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            msg = "报警阈值获取失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmRuleDtos);
-
-        return resultMap;
-    }
-
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
new file mode 100644
index 0000000..19d3b8c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanRs")
+public class PgAssetPlanRs {
+
+    @Resource
+    private PgAssetPlanManager pgAssetPlanManager;
+
+    /**
+     * 获取巡检记录
+     */
+    @POST
+    @Path("getPgAssetPlanList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPgAssetPlanList(@FormParam("inSpectionPlace") String inSpectionPlace){
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+
+        List<PgAssetPlanDto> pgAssetPlanDtoList=new ArrayList<>();
+        try{
+            pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(inSpectionPlace);
+            if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
+                msg="巡检信息获取成功";
+            else
+                msg="不存在巡检信息";
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="巡检信息获取失败";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAssetPlanDtoList);
+
+        return resultMap;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
new file mode 100644
index 0000000..47ef9d1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanStaticRs")
+public class PgAssetPlanStaticRs {
+
+    @Resource
+    private PgAssetPlanManager pgAssetPlanManager;
+
+    @POST
+    @Path("getPgAssetPlanStaticList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPgAssetPlanStaticList(@FormParam("startTime") String startTime,
+                                                       @FormParam("endTime") String endTime,
+                                                       @FormParam("staticType") String staticType) throws Exception{
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        String result="";
+
+        List<PgAssetPlanStatic> pgAssetPlanStaticList = null;
+        try{
+            pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
+            if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
+                msg="巡检统计信息获取成功";
+            else
+                msg="统计信息获取失败";
+        }
+        catch (Exception ex){
+            ex.printStackTrace();
+            msg="统计失败";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAssetPlanStaticList);
+
+        return resultMap;
+    }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
deleted file mode 100644
index 66f4d09..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.manager.PgAssetInSpectionRecordManager;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@Path("pgAssetRecordRs")
-public class PgAssetRecordRs {
-
-    @Resource
-    private PgAssetInSpectionRecordManager pgAssetInSpectionRecordManager;
-
-    /**
-     * 获取巡检记录
-     */
-    @POST
-    @Path("getPgAssetRecordList")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgAssetRecordList(@FormParam("patrolMan") String patrolMan,
-                                                   @FormParam("startTime") String startTime,
-                                                   @FormParam("endTime") String endTime){
-        Map<String,Object> resultMap=new HashMap<>();
-        String msg="";
-
-        List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
-        try{
-            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(patrolMan,startTime,endTime);
-            if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0)
-                msg="巡检信息获取成功";
-            else
-                msg="不存在巡检信息";
-        }
-        catch(Exception ex){
-            ex.printStackTrace();
-            msg="巡检信息获取失败";
-        }
-
-        resultMap.put("msg",msg);
-        resultMap.put("result",pgAssetInSpectionRecordDtoList);
-
-        return resultMap;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java
deleted file mode 100644
index 5f0417a..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import com.casic.PgInterface.maintenance.manager.PgAssetInSpectionRecordManager;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@Path("pgAssetRecordStaticRs")
-public class PgAssetRecordStaticRs {
-
-    @Resource
-    private PgAssetInSpectionRecordManager pgAssetInSpectionRecordManager;
-
-    @POST
-    @Path("getPgAssetRecordHeadStaticList")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgAssetRecordHeadStaticList(@FormParam("startTime") String startTime,
-                                                                @FormParam("endTime") String endTime,
-                                                                @FormParam("staticType") String staticType) throws Exception{
-        Map<String,Object> resultMap=new HashMap<>();
-        String msg="";
-        String result="";
-
-        List<PgAssetInSpectionRecordStatic> pgAssetInSpectionRecordStaticList = null;
-        try{
-            pgAssetInSpectionRecordStaticList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordStaticLisByTime(startTime,endTime,staticType);
-            if(pgAssetInSpectionRecordStaticList!=null&&pgAssetInSpectionRecordStaticList.size()!=0)
-                msg="巡检统计信息获取成功";
-            else
-                msg="统计信息获取失败";
-        }
-        catch (Exception ex){
-            ex.printStackTrace();
-            msg="统计失败";
-        }
-
-        resultMap.put("msg",msg);
-        resultMap.put("result",pgAssetInSpectionRecordStaticList);
-
-        return resultMap;
-    }
-
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index 9dfdd88..a0245ba 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -326,7 +326,7 @@
 
             PgConstruction pgConstruction=pgConstructionManager.get(Long.valueOf(id));
 
-            pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(pgConstruction.getPgName());
+            pgDeviceDtoList=pgDeviceManager.getPgCameraListByPartition(pgConstruction.getPgName());
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index 1c8130c..c276fb3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -177,6 +177,7 @@
             else
             {
                 pgEquipment.setActive(0);
+                pgEquipmentManager.save(pgEquipment);
                 msg="删除成功";
                 result="true";
             }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index 486b49f..f0b936c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -287,7 +287,7 @@
         try {
             if (apCode != "") {
                 String apCodeStr=apCode.substring(0,3);
-                pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(apCodeStr);
+                pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition("",apCodeStr);
                 if(pgDeviceDtoList==null)
                     msg="不存在关联摄像机";
                 else
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 982e3d9..a6da81e 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -11,15 +11,13 @@
 
 
 # ============================================================================
-# dbd
+# db
 # ============================================================================
 db.default.driverClassName=oracle.jdbc.driver.OracleDriver
-db.default.url=jdbc:oracle:thin:@172.17.0.201:1521:szgl
-#db.default.url=jdbc:oracle:thin:@119.254.103.80:1521:chengdu
-db.default.username=scott
-db.default.password=scott
-#db.default.username=PG
-#db.default.password=PG
+#db.default.url=jdbc:oracle:thin:@172.17.0.201:1521:szgl
+db.default.url=jdbc:oracle:thin:@119.254.103.80:1521:chengdu
+db.default.username=PG
+db.default.password=PG
 
 
 # ============================================================================
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190828.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190828.docx"
new file mode 100644
index 0000000..7920004
--- /dev/null
+++ "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190828.docx"
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190828.docx" "b/~$\350\257\264\346\230\21620190828.docx"
new file mode 100644
index 0000000..575ddd4
--- /dev/null
+++ "b/~$\350\257\264\346\230\21620190828.docx"
Binary files differ
diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\21620190726.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\21620190726.docx"
deleted file mode 100644
index d320e29..0000000
--- "a/\346\216\245\345\217\243\350\257\264\346\230\21620190726.docx"
+++ /dev/null
Binary files differ
diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\21620190910.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\21620190910.docx"
new file mode 100644
index 0000000..0650e1e
--- /dev/null
+++ "b/\346\216\245\345\217\243\350\257\264\346\230\21620190910.docx"
Binary files differ
diff --git "a/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190612.docx" "b/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190612.docx"
deleted file mode 100644
index 2dccbc8..0000000
--- "a/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190612.docx"
+++ /dev/null
Binary files differ
diff --git "a/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190828.docx" "b/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190828.docx"
new file mode 100644
index 0000000..2dccbc8
--- /dev/null
+++ "b/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190828.docx"
Binary files differ